66666

views/Integral.vue

@@ -253,14 +253,16 @@
 		<view class="privilege-container">
 			<!-- 第一行 -->
 			<view class="privilege-header">
-				<text class="quanyi-title" v-if="islogin" 
+				<text class="quanyi-title"
 				 	:style="{ color: getColor('quanyiTitle')[itemIndex].titleColor }">LV{{ (Number(itemIndex) + 1) }}专享权益</text>
-				<text class="title-text" v-if="islogin"
+				<text class="title-text"
 				 	:style="{ color: getColor('quanyiTitle')[itemIndex].quanyiNumColor }">当前可享<text class="highlight"
 					:style="{ color: getColor('quanyiTitle')[itemIndex].quanyiNumColor }">{{quanyiBgs[itemIndex].quanyiNum}}</text>项权益，升级解锁更多权益～</text>
-				<text class="title-text"  v-if="!islogin"
+				<!-- <text class="title-text"  v-if="!islogin"
 				 	:style="{ color: getColor('quanyiTitle')[itemIndex].quanyiNumColor }">最高可享 <text class="highlight"
-					:style="{ color: getColor('quanyiTitle')[itemIndex].quanyiNumColor }">10</text> 项权益会员</text>
+					:style="{ color: getColor('quanyiTitle')[itemIndex].quanyiNumColor }">10</text> 项权益会员</text> -->
+
+
 				<!-- <view class="rule-container">
 					<text 
 						class="rule-text"
@@ -1580,7 +1582,6 @@ import YearGift from '../components/pointRightsCom/yearGift.vue';
 	const getProgress = (index) => {
 		let progress = 0;
 		const val = getHuangjinMaxVal()[index];
-		console.log('val666666==',val);
 		progress = (points.value/val)*100;
 		if(progress > 100){
 			progress = 100;
@@ -1724,18 +1725,23 @@ import YearGift from '../components/pointRightsCom/yearGift.vue';
 	
 	const getHuangjinMaxVal = () => {
 		let maxVal = [];
+
+		if(!memberInfo.value.gradeList){
+			return [1,1,1000,5000,10000];
+		}
+
 		switch(Number(memberInfo.value.grade)){
 			case 0:
-				maxVal = [gradeList.value[0]?.gradeScoreRuleMax,gradeList.value[1]?.gradeScoreRuleMin,gradeList.value[2]?.gradeScoreRuleMin,gradeList.value[3]?.gradeScoreRuleMin,gradeList.value[4]?.gradeScoreRuleMin];
+				maxVal = [gradeList?.value[0]?.gradeScoreRuleMax,gradeList?.value[1]?.gradeScoreRuleMin,gradeList?.value[2]?.gradeScoreRuleMin,gradeList?.value[3]?.gradeScoreRuleMin,gradeList?.value[4]?.gradeScoreRuleMin];
 				break;
 			case 1:
-				maxVal = [-1,gradeList.value[1]?.gradeScoreRuleMax,gradeList.value[2]?.gradeScoreRuleMin,gradeList.value[3]?.gradeScoreRuleMin,gradeList.value[4]?.gradeScoreRuleMin];
+				maxVal = [-1,gradeList?.value[1]?.gradeScoreRuleMax,gradeList?.value[2]?.gradeScoreRuleMin,gradeList?.value[3]?.gradeScoreRuleMin,gradeList?.value[4]?.gradeScoreRuleMin];
 				break;
 			case 2:
-				maxVal = [-1,-1,gradeList.value[2]?.gradeScoreRuleMax,gradeList.value[3]?.gradeScoreRuleMin,gradeList.value[4]?.gradeScoreRuleMin];
+				maxVal = [-1,-1,gradeList?.value[2]?.gradeScoreRuleMax,gradeList?.value[3]?.gradeScoreRuleMin,gradeList?.value[4]?.gradeScoreRuleMin];
 				break;
 			case 3:
-				maxVal = [-1,-1,-1,gradeList.value[3]?.gradeScoreRuleMax,gradeList.value[4]?.gradeScoreRuleMin];
+				maxVal = [-1,-1,-1,gradeList?.value[3]?.gradeScoreRuleMax,gradeList?.value[4]?.gradeScoreRuleMin];
 				break;
 			case 4:
 				maxVal = [-1,-1,-1,-1,-1];
@@ -1804,7 +1810,11 @@ import YearGift from '../components/pointRightsCom/yearGift.vue';
 		initNetData();
 
 
-		itemIndex.value = vipLevel.value;
+		if(islogin.value){
+			itemIndex.value = vipLevel.value;
+		}else{
+			itemIndex.value = 0;
+		}
 
 		hideLoading();
 	});
@@ -1813,6 +1823,7 @@ import YearGift from '../components/pointRightsCom/yearGift.vue';
 		console.log('initNetData');
 		
 		memberInfo.value = userStore.memberInfo;
+		// memberInfo.value = {"grade": null, "gradeList": null, "gradeName": null, "maxGrade": false, "memberId": "not_login", "memberName": null, "mobile": null, "nextGradeScoreRuleMin": null, "orderUpgrade": null, "points": null, "recentAnnualPointsTotal": null, "willExpiredPoints": null} ;
 // 		memberInfo.value = {
 //   "grade": "4",
 //   "gradeList": [
@@ -1872,6 +1883,9 @@ import YearGift from '../components/pointRightsCom/yearGift.vue';
 			islogin.value = true
 		}
 
+		console.log('memberInfo.value===============',memberInfo.value);
+		console.log('islogin.value===============',islogin.value);
+
 		// islogin.value = false;
 		if(islogin.value){
 			nickName.value = memberInfo.value.memberName;			
@@ -2606,7 +2620,7 @@ import YearGift from '../components/pointRightsCom/yearGift.vue';
 						height:256rpx;
 						top: 0rpx;
 						opacity: 0;
-						// background: #6f6d67;
+						background: #6f6d67;
 					}
 
 				}
@@ -2916,7 +2930,7 @@ import YearGift from '../components/pointRightsCom/yearGift.vue';
 					top:0rpx;
 					position: absolute;
 					opacity: 0;
-					// background: #6f6d67;
+					background: #6f6d67;
 				}
 			}
 		}