页面调整

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',

pages/index/currentPoints.vue

@@ -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>

pages/index/index.vue

@@ -648,7 +648,8 @@ export default {
 			showMaterialPackageListStatus: false,
 			shouyiMoeny:'',
 			homePageCountNumTwo:'',
-			homePageCountNumOme:''
+			homePageCountNumOme:'',
+			technicianData: {}
 		}
 	},
 	onShareAppMessage(res) { //发送给朋友
@@ -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(){//跳往当前收益
@@ -899,8 +908,9 @@ export default {
 			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;
 
@@ -912,7 +922,7 @@ export default {
 						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;
 					}
 				})
 			}

pages/index/technicianLevel.vue

@@ -13,9 +13,34 @@
 						<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">
 					<view class="djimg">{{ artificerData.grade }}</view>
 					<!---<view class="djimg-text">当期等级</view>-->
@@ -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>
@@ -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;
 						}
@@ -187,7 +226,7 @@
 		flex-direction: column;
 		position: absolute;
 		top: 0;
-		margin-top: 100px;
+		margin-top: 160px;
 	}
 	.djimg-text{
 		font-size: 23rpx;
@@ -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,7 +287,7 @@
 		margin-top: 16px;
 	}
 	.header-right{
-		width: 65%;
+		width: 100%;
 		display: flex;
 		flex-direction: column;
 		align-items: center;