66666

mock/my.json

@@ -426,22 +426,13 @@
     ],
     "activeInfo": [
       {
-        "img": "https://course.feihe.com/momclub-picture/my/activeImg0.png",
+        "img": "https://course.feihe.com/momclub-picture/my/activeImg0823.png",
         "extra": {
           "envVersion": "release",
           "appId": "wx4205ec55b793245e"
         },
-        "type": 2,
-        "url": "subPackages/shopMainList/topicNew/index?id=1000911"
-      },
-      {
-        "img": "https://course.feihe.com/momclub-picture/my/activeImg1.png",
-        "extra": {
-          "envVersion": "release",
-          "appId": "wx4205ec55b793245e"
-        },
-        "type": 2,
-        "url": "subPackages/shopMainList/topicNew/index?id=1000912"
+        "type": 1,
+        "url": "/pages/syWebview/syWebview?p=xmh12"
       }
     ],
     "channelOptions": [

views/Integral.vue

@@ -57,11 +57,11 @@
 					/>
 
 					<text class="current-xingyaodengji-tips"
-						v-if="getHuangjinMaxVal()[index] == -1 && !(memberInfo.grade == 0 && !memberInfo.orderUpgrade && points == 1)"
+						v-if="getHuangjinMaxVal()[index] == -1 && !(memberInfo.grade == 0 && !memberInfo.orderUpgrade && points >= 1)"
 						:style="{ color: getColor('jifen')[index]?.currentPoints }"
 					> {{ itemIndex == 4 ? '您已经升至最高等级' : '您已超越该等级' }}</text>
 
-					<view class="saoma-tips" v-if="memberInfo.grade == 0 && !memberInfo.orderUpgrade && points == 1">
+					<view class="saoma-tips" v-if="memberInfo.grade == 0 && !memberInfo.orderUpgrade && points >= 1">
 					 	<text class="saoma-tips-text"
 							
 							:style="{ color: getColor('saomaTips')[index]?.textColor }"
@@ -95,7 +95,7 @@
 
 
 				<view class="jifen-progressbar"
-						 v-if="getHuangjinMaxVal()[index] != -1 && !(memberInfo.grade == 0 && !memberInfo.orderUpgrade && points == 1)"
+						 v-if="getHuangjinMaxVal()[index] != -1 && !(memberInfo.grade == 0 && !memberInfo.orderUpgrade && points >= 1)"
 						 @click="integralHandler"
 					>
 						<!-- 积分标题和数值 -->
@@ -1776,7 +1776,7 @@ import ShengriliTipPanel from '../components/quanyi/shengriliTipPanel.vue';
 		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",
+//   "grade": "0",
 //   "gradeList": [
 //     {
 //       "grade": "0",
@@ -1814,10 +1814,10 @@ import ShengriliTipPanel from '../components/quanyi/shengriliTipPanel.vue';
 //   "memberId": "CRM000000000948094264",
 //   "memberName": "文慧17637145052",
 //   "mobile": "17637145052",
-//   "nextGradeScoreRuleMin": 10000,
-//   "orderUpgrade": true,
+//   "nextGradeScoreRuleMin": 1,
+//   "orderUpgrade": false,
 //   "points": 999,
-//   "recentAnnualPointsTotal": 5500,
+//   "recentAnnualPointsTotal": 0,
 //   "willExpiredPoints": 100000
 // };