页面调整

my/fund/index.vue

@@ -124,7 +124,6 @@
 		},
 		//上拉触底
 		onReachBottom(e) {
-			console.log(e, "dwdw123123");
 			this.currentPage += 1;
 			this.isScroll = true;
 			if (this.loadingStatus == "nomore") {

my/renzheng/index.vue

@@ -348,6 +348,7 @@
 			this.getUserInfo()
 
 			this.renzheng = uni.getStorageSync("renzheng")
+
 			// #ifdef APP
 			this.openLists = [{
 					image: '../../static/images/icon_weixin.png',
@@ -760,7 +761,7 @@
 												if (that.infantImg.length <= 5) {
 													that.infantImg.push(JSON.parse(uploadFileRes.data)
 														.data)
-									
+
 												}
 											} else if (e == 2) {
 												if (that.certificateImg.length <= 5) {
@@ -779,7 +780,7 @@
 							   cons.log("上传失败")
 							  }
 							});
-							
+
 						}
 					}
 				})
@@ -800,7 +801,7 @@
 							that.form.headImg = JSON.parse(uploadFileRes.data).data
 							console.log(that.form.headImg)
 							uni.hideLoading();
-					
+
 						}
 					});
 				}
@@ -849,7 +850,7 @@
 					sourceType: ['album', 'camera'],
 					success: res => {
 						for (let i = 0; i < res.tempFilePaths.length; i++) {
-							
+
 							uni.getFileInfo({
 							  filePath: res.tempFilePaths[i],
 							  success: (infoRes) => {
@@ -876,7 +877,7 @@
 												console.log(that.form.headImg)
 											}
 											uni.hideLoading();
-									
+
 										}
 									});
 							    }
@@ -885,7 +886,7 @@
 							   cons.log("上传失败")
 							  }
 							});
-							
+
 						}
 					}
 				})
@@ -1107,10 +1108,10 @@
 	.bg {
 		width: 94%;
 		margin:30rpx auto;
-		background-color: #FFFFFF;		
+		background-color: #FFFFFF;
 		padding: 20rpx 36rpx;
 		border-radius: 26rpx;
-		
+
 	}
 	.add-word{
 		font-size: 26rpx;
@@ -1195,4 +1196,4 @@
 	.bgCol2 {
 		color: #557EFD;
 	}
-</style>
+</style>

pages/index/currentPoints.vue

@@ -19,9 +19,9 @@
 						<span>{{endTime}}</span>
 					</view>
 				</view>
-				
+
 			</view>
-			
+
 			<view class="flex justify-end">
 				<view  class="header-top-btn"  @click="wangqi">往期积分</view>
 			</view>
@@ -38,7 +38,9 @@
 				<view class="view-title">
 					<view class="view-title-left">
 						<span class="view-title-left-shuxian"></span>
-						<span class="view-title-left-text">业绩积分:<text class="view-num">{{yjjf}}</text>(项目金额累计积分，兑换比例为1:1)</span>
+						<span class="view-title-left-text">业绩积分:<text class="view-num">{{yjjf}}</text>
+						<!-- (项目金额累计积分，兑换比例为1:1) -->
+						</span>
 					</view>
 					<!-- <view class="view-title-right" @click="jieshi">更多</view> -->
 				</view>
@@ -111,7 +113,9 @@
 				<view class="view-title">
 					<view class="view-title-left">
 						<span class="view-title-left-shuxian"></span>
-						<span class="view-title-left-text">储值积分: <text class="view-num">{{czjf}}</text>(为您充值累计积分，兑换比例为1:1)</span>
+						<span class="view-title-left-text">储值积分: <text class="view-num">{{czjf}}</text>
+						<!-- (为您充值累计积分，兑换比例为1:1) -->
+						</span>
 					</view>
 					<!-- <view class="view-title-right" @click.stop="toggle('时长积分')">更多</view> -->
 				</view>
@@ -135,7 +139,9 @@
 				<view class="view-title">
 					<view class="view-title-left">
 						<span class="view-title-left-shuxian"></span>
-						<span class="view-title-left-text">充值积分: <text class="view-num">{{ddczjf}}</text>(充值积分比例为1:1)</span>
+						<span class="view-title-left-text">充值积分: <text class="view-num">{{ddczjf}}</text>
+						<!-- (充值积分比例为1:1) -->
+						</span>
 					</view>
 					<!-- <view class="view-title-right" @click.stop="toggle('充值积分')">更多</view> -->
 				</view>
@@ -153,7 +159,7 @@
 						<span class="table-view-child" v-for="(item , index) in ddczList">{{item.jifen}}</span>
 					</view>
 				</view>
-				
+
 				<view v-if="ddczList.length == 0" style="line-height: 80px;width:100%;text-align: center;">
 					<span >暂无数据</span>
 				</view>
@@ -321,7 +327,7 @@
 		font-size: 30rpx;
 		color: #333333;
 	}
-	
+
 	.tapNav-bor{
 		width: 62px;
 		height: 14rpx;
@@ -398,7 +404,7 @@
 		align-items: center;
 		margin-top: 10px;
 	}
-	
+
 	.popup-mian{
 		width: 88%;
 		display: flex;
@@ -521,9 +527,9 @@
 		height: 160rpx;
 		background: #E6E6E6;
 		border-radius: 30rpx;
-		
+
 	}
-		
+
 	.mian-foot{
 		width: 100%;
 		display: flex;
@@ -698,4 +704,4 @@
 	.mian-bottom-xiang{
 		color: #7D7D7D;
 		}
-</style>
+</style>

pages/index/index.vue

@@ -3,7 +3,7 @@
 	<view style="padding-bottom: 17px;">
 		<view class="jishi-index">
 			<view class="u-flex justify-between avatar-section">
-				<!--<view class="back-img" 
+				<!--<view class="back-img"
 				:style="{'background-image':
 							technicianType=='3'?'url(../../static/grade1.gif)':
 							technicianType=='4'?'url(../../static/grade2.png)':
@@ -33,7 +33,7 @@
 								签到
 							</view>
 						</view>
-						
+
 						<!-- <view class="flex margin-left-sm " style="font-size: 22rpx;font-weight: 500;"
 							v-if="XCXIsSelect != '否'">
 							<view v-if="renzheng == 0" @click.stop="goNav('/my/renzheng/index')">
@@ -97,10 +97,10 @@
 						<!-- <text style="font-size: 30px;font-weight: bold;">当前业绩：{{ currentWholeIncome ? currentWholeIncome : 0 }}</text> -->
 						<!-- <text style="font-size: 16px;">/{{ totalIncomeRange ? totalIncomeRange : 4000 }}</text> -->
 					</view>
-					
+
 					<!-- <u-line-progress active-color="#46a396" :show-percent="false" :height="38" inactive-color="#098f7a"
 						:percent="lineProgressData" :striped-active="true"></u-line-progress>
-			
+
 					<view v-if="!maxStatus && longUpgradeDescriptionSet.differenceOutstandingAchievement" class="dengji-text">
 						还差{{ longUpgradeDescriptionSet.differenceOutstandingAchievement }}业绩;{{ longUpgradeDescriptionSet.differenceIntegral }}积分;可以升级{{ longUpgradeDescriptionSet.differenceGrade }}<u-icon
 							style="padding-left: 2px;" size="30" color="#ffffff" name="question-circle-fill"
@@ -445,7 +445,7 @@
 					<view class="bgwhite radius margin-top-sm padding-bottom-sm"
 						:style="{ backgroundColor: item.status == 2 ? '#f6fcfa' : '', border: item.status == 2 ? '2px solid rgb(207, 237, 225)' : '' }"
 						v-for="(item, index) in goods" :key='index' @click="goNav('/my/order/revenueDetails?ordersId=' + item.ordersId)">
-						
+
 						<view class="xian" v-if="item.status == 6"></view>
 						<view class="pintuan_syrs flex justify-between" v-if="item.status == 6">
 							<view class="pintuan-title" >
@@ -459,7 +459,7 @@
 							<u-count-down :timestamp="item.endOfServiceTimer" separator-color="#20C675" color="#20C675"
 								font-size="30" separator-size="30"></u-count-down>
 						</view>
-						
+
 						<view class="flex justify-between padding-sm-title ">
 							<view class="progress-text">
 								<text class="title-font text-bold">预约时间：</text>
@@ -648,7 +648,8 @@ export default {
 			showMaterialPackageListStatus: false,
 			shouyiMoeny:'',
 			homePageCountNumTwo:'',
-			homePageCountNumOme:''
+			homePageCountNumOme:'',
+			technicianData: {}
 		}
 	},
 	onShareAppMessage(res) { //发送给朋友
@@ -719,7 +720,7 @@ export default {
 			}
 		});
 		// this.getcity()
-		
+
 	},
 	onShow() {
 		this.getHomeListData();
@@ -752,7 +753,7 @@ export default {
 		});
 		// this.userId = uni.getStorageSync('userId')
 		this.userId = this.$queue.getData("userId")
-		
+
 			console.log('this.userId------------->',this.userId);
 		this.isCashDeposit = uni.getStorageSync('isCashDeposit')
 		if (this.userId) {
@@ -818,7 +819,7 @@ export default {
 				this.upgradeDescriptionStatus = null;
 				this.currentRealIncome = null;
 				this.lineProgressData = 0;
-				this.currentGrade = "A0";
+				this.currentGrade = "T0";
 				this.totalIncomeRange = 4000;
 				this.currentIntegral = null;
 				this.homePageCountNum[0].num = 0;
@@ -831,7 +832,15 @@ export default {
 	methods: {
 		level(){//跳往 技师等级
 			uni.navigateTo({
-				url:'/pages/index/technicianLevel'
+				url:'/pages/index/technicianLevel?ultimately='
+				+this.technicianData.ultimately
+				+'&lastGrade='+this.technicianData.lastGrade
+				+"&grade="+this.technicianData.grade
+				+"&maxStatus="+this.technicianData.maxStatus
+				+"&differenceDurationOnline="+this.technicianData.differenceDurationOnline
+				+"&differenceOutstandingAchievement="+this.technicianData.differenceOutstandingAchievement
+				+"&differenceIntegral="+this.technicianData.differenceIntegral
+				+"&differenceGrade="+this.technicianData.differenceGrade
 			})
 		},
 		dangqian(){//跳往当前收益
@@ -861,15 +870,15 @@ export default {
 							this.formatHomeMaterialPackageList = res?.data.slice(0, 3);
 							// this.formatHomeMaterialPackageList = [];
 							this.homeMaterialPackageList = res.data;
-							
+
-							
+
 							console.log('this.homeMaterialPackageList------>>',this.homeMaterialPackageList);
 							console.log('this.formatHomeMaterialPackageList------>>',this.formatHomeMaterialPackageList);
-							
+
 						}
 					})
 			}
-			
+
 		},
 		clickIcon(index) {
 			console.log(index);
@@ -886,7 +895,7 @@ export default {
 					url:'/pages/index/currentIncome?type='+id+'&shouyiMoeny='+this.shouyiMoeny
 				})
 			}
-			
+
 			// this.$queue.showToast('敬请期待！')
 			// 如果需要当期订单/当期加钟率/当期充值率点击样式时解开注释即可
 			// if (id !== undefined) this.activeTab = id;
@@ -894,25 +903,26 @@ export default {
 		//获取App首页数据
 		getHomeListData() {
 			let artificerId = uni.getStorageSync("artificerId");
-			
+
 			console.log('artificerId------->',artificerId);
 			if (artificerId) {
 				this.$Request.getXZX("/app/artificer/integral/home/?artificerId=" + artificerId,).then((res) => {
 					if (res && res.data) {
-						console.log(res, "dwdw00of");
+
-						this.shouyiMoeny=res?.data?.currentMonthsIncome
+						this.technicianData=res.data;
-						
+						this.shouyiMoeny=res?.data?.currentMonthsIncome;
+
 						this.homePageCountNum[0].num = res?.data?.currentPeriodOrdersSum;
-						
+
 						let formathomePageCountNum = (res?.data?.currentPeriodAddBellsSum * 1) * 100;
 						this.homePageCountNum[1].num = Math.ceil(formathomePageCountNum) + "%";
 						this.homePageCountNumOne=this.homePageCountNum[1].num;
-						
+
 						let currentPeriodRechargeSum = ((res?.data?.currentPeriodRechargeSum * 1) * 100);
 						this.homePageCountNum[2].num = Math.ceil(currentPeriodRechargeSum) + "%";
 						this.homePageCountNumTwo=this.homePageCountNum[2].num;
-						
+
-						this.currentWholeIncome = Math.ceil(res?.data?.currentPerformance);
+						this.currentWholeIncome = res?.data?.currentPerformance;
 						this.currentRealIncome = res?.data?.earnings;
 						this.currentIntegral = res?.data?.integral;
 						this.maxStatus = res?.data.maxStatus;
@@ -925,10 +935,10 @@ export default {
 							currentLevel: res?.data?.currentLevel,
 							differenceGrade: res?.data?.differenceGrade,
 						};
-						this.upgradeDescriptionStatus = res?.data?.newUltimately;
+						this.upgradeDescriptionStatus = res?.data?.ultimately;
 						this.currentGrade = res?.data?.grade;
 						uni.setStorageSync("currentRealIncome", res?.data?.earnings);
-						this.totalIncomeRange = res?.data?.suffix;
+						// this.totalIncomeRange = res?.data?.suffix;
 						// if (this.currentWholeIncome < 4000) {
 						// 	this.totalIncomeRange = 4000;
 						// } else if (this.currentWholeIncome < 6000 && this.currentWholeIncome > 4000) {
@@ -941,7 +951,7 @@ export default {
 						// 	this.totalIncomeRange = 4000;
 						// }
 						// this.currentWholeIncome = 2000;
-						this.lineProgressData = this.currentWholeIncome / this.totalIncomeRange * 100;
+						// this.lineProgressData = this.currentWholeIncome / this.totalIncomeRange * 100;
 					}
 				})
 			}
@@ -951,7 +961,7 @@ export default {
 				url: ""
 			})
 		},
-		
+
 		getNewOrder() {
 			let data = {
 				page: 1,
@@ -1127,7 +1137,7 @@ export default {
 							let formatTimeStamp = Math.floor(afterTimeStamp - currentTimeStamp);
 							console.log(currentTimeStamp,"currentTimeStamp=======？");
 							d.endOfServiceTimer = formatTimeStamp;
-							
+
 						}
 						this.goods.push(d);
 					});
@@ -1457,7 +1467,7 @@ export default {
 					// if (ret.subscriptionsSetting.itemSettings && Object.keys(ret.subscriptionsSetting.itemSettings).length == 2) {
 					if (ret.subscriptionsSetting.itemSettings) {
 						uni.setStorageSync('sendMsg', true)
-						uni.openSetting({ // 打开设置页 
+						uni.openSetting({ // 打开设置页
 							success(rea) {
 								console.log(rea.authSetting)
 							}
@@ -1536,7 +1546,7 @@ export default {
 							let formatTimeStamp = Math.floor(afterTimeStamp - currentTimeStamp);
 							console.log(currentTimeStamp,"currentTimeStamp=======？");
 							d.endOfServiceTimer = formatTimeStamp;
-							
+
 						}
 						this.goods.push(d);
 					});
@@ -1545,7 +1555,7 @@ export default {
 				this.mescroll.endBySize(res.data.list.length, res.data.totalCount)
 				if (page.num == 1) this.goods = []; //如果是第一页需手动制空列表
 				this.goods = [...this.goods, ...res.data.list]; //追加新数据
-						
+
 				this.goods.forEach(ret => {
 					if (ret.status == 6 && ret.endTime) {
 						let afterTimeStamp = new Date(ret.endTime).getTime() / 1000;
@@ -1555,7 +1565,7 @@ export default {
 					}
 					if (this.$refs.countDownEl) this.$refs.countDownEl.update();
 				})
-				this.mescroll.endSuccess(res.data.list.length); // 隐藏加载状态栏					
+				this.mescroll.endSuccess(res.data.list.length); // 隐藏加载状态栏
 			}).catch(() => {
 				//联网失败, 结束加载
 				this.mescroll.endErr();
@@ -1928,7 +1938,7 @@ page {
 		font-family: Helvetica Neue, Helvetica, sans-serif;
 		color: #fff;
 		display: flex;
-		flex-direction: row; 
+		flex-direction: row;
 		align-items: center;
 		justify-content: center;
 	}
@@ -2077,7 +2087,7 @@ uni-switch::before {
 	align-items: center;
 	font-size: 16px;
 	padding-top: 10px;
-	
+
 }
 
 .import {
@@ -2188,4 +2198,4 @@ uni-switch::before {
 .money_text2{
 	font-size:26rpx;
 }
-</style>
+</style>

pages/index/technicianLevel.vue

@@ -13,7 +13,32 @@
 						<span>{{ artificerData.beginTime }}~{{ artificerData.finishTime }}</span>
 					</view>
 					<view class="header-right-text">
-						备注: 本期等级是根据技师上个周期的业绩最终计算得出
+						<view v-if="ultimately">
+							<view v-if="lastGrade">
+								上周期等级：【{{lastGrade}}】
+							</view>
+							<view v-if="grade">
+								本周期等级：【{{grade}}】
+							</view>
+							<view v-if="maxStatus==true">
+								已满级。
+							</view>
+							<view v-else>
+								<view>升级到【{{differenceGrade}}】还差</view>
+								<span v-if="differenceDurationOnline">
+									【{{differenceDurationOnline}}】小时
+								</span>
+								<span v-if="differenceOutstandingAchievement">
+									【{{differenceOutstandingAchievement}}】业绩
+								</span>
+								<span v-if="differenceIntegral">
+									【{{differenceIntegral}}】积分
+								</span>
+							</view>
+						</view>
+						<view v-else>
+							备注: 本期等级是根据技师上个周期的业绩最终计算得出
+						</view>
 					</view>
 				</view>
 				<view class="header-right-bottom">
@@ -33,18 +58,18 @@
 						</view>
 					</view>
 					<view class="mian-list-bottom">
-						<view class="mian-list-view">
-							<span>{{ item.outstandingAchievement }}</span>
-							<span>最低业绩</span>
-						</view>
 						<view class="mian-list-view">
 							<span>{{ item.durationOnline }}h</span>
 							<span>在线时长</span>
 						</view>
 						<view class="mian-list-view">
+							<span>{{ item.outstandingAchievement }}</span>
+							<span>最低业绩</span>
+						</view>
+<!-- 						<view class="mian-list-view">
 							<span>{{ item.clockRate*100 }}%</span>
 							<span>加钟率</span>
-						</view>
+						</view> -->
 						<view class="mian-list-view">
 							<span>{{ item.integral }}</span>
 							<span>积分</span>
@@ -52,7 +77,7 @@
 					</view>
 				</view>
 			</view>
-			
+
 		</view>
 	</view>
 </template>
@@ -69,15 +94,30 @@
 				page: 1,
 				limit: 10,
 				artificerData: {},
-				ArtificerLevelList: []
+				ArtificerLevelList: [],
+				ultimately: "",
+				lastGrade: "",
+				grade: "",
+				maxStatus: "",
+				differenceDurationOnline: "",
+				differenceOutstandingAchievement: "",
+				differenceIntegral: "",
+				differenceGrade: "",
 			}
 		},
 		onLoad(e) {
+			this.ultimately = e.ultimately;
+			this.lastGrade = e.lastGrade;
+			this.grade = e.grade;
+			this.maxStatus = e.maxStatus;
+			this.differenceDurationOnline = e.differenceDurationOnline;
+			this.differenceOutstandingAchievement = e.differenceOutstandingAchievement;
+			this.differenceIntegral = e.differenceIntegral;
+			this.differenceGrade = e.differenceGrade;
 			this.getArtificerLevels();
 		},
 		methods: {
 			fanhui(){
-				console.log(111)
 				uni.switchTab({
 					url:'/pages/index/index'
 				})
@@ -91,7 +131,6 @@
 				}
 				this.$Request.get("/app/artificer/integral/getArtificerLevels",data).then((res) => {
 						if (res && res.code === 0) {
-							console.log(res);
 							this.artificerData = res.artificerData;
 							this.ArtificerLevelList = res.levelData.records;
 						}
@@ -169,7 +208,7 @@
 		align-items: center;
 		justify-content: space-between;
 		margin-bottom: 10px;
-		
+
 	}
 	.mian-list{
 		width: 100%;
@@ -187,14 +226,14 @@
 		flex-direction: column;
 		position: absolute;
 		top: 0;
-		margin-top: 100px;
+		margin-top: 160px;
 	}
 	.djimg-text{
 		font-size: 23rpx;
 		color: #FFFFFF;
-		
+
 	}
-	
+
 	.djimg {
 		position: absolute;
 		right: 20px;
@@ -221,8 +260,8 @@
 		margin-right: 6px;
 	}
 	.header-right-text{
-		margin-top: 6px;
+		margin-top: 10px;
-		font-size: 22rpx;
+		font-size: 26rpx;
 		color: #FFFFFF;
 	}
 	.header-right-top span:nth-child(1){
@@ -248,12 +287,12 @@
 		margin-top: 16px;
 	}
 	.header-right{
-		width: 65%;
+		width: 100%;
 		display: flex;
 		flex-direction: column;
 		align-items: center;
 	}
-	
+
 	.header{
 		width: 100%;
 		padding: 13px 20px;
@@ -316,4 +355,4 @@
 		color: #fe912E;
 		font-size: 24rpx;
 	}
-</style>
+</style>