界面优化

pages/my/myInfo.vue

@@ -14,21 +14,21 @@
 						<view class="flex-col margin-left user-info-box">
 							<text class="text-title text-lg text-bold text-xxl">{{userInfo.nickName||"凑角用户"}}</text>
 							<view class="flex-row" style="margin-top: 10rpx;">
-								<view v-if="!userInfo.memberConfig || (userInfo.memberConfig&&userInfo.memberConfig.memberType ==1)" class="relative" :class="!userInfo.memberConfig?'grayscale':''">
+								<view class="relative" :class="userInfo.consumerMember&&userInfo.consumerMember.isRecharge?'':'grayscale'">
 									<image class="img-icon" :src="assetsPath+'/tag_icon_1.png'" mode="widthFix"></image>
 									<view class="absolute">
 										<text class="text-1">充值会员</text>
 									</view>
 								</view>
-								<view v-if="!userInfo.memberConfig || (userInfo.memberConfig&&userInfo.memberConfig.memberType ==2)" class="relative" :class="!userInfo.memberConfig?'grayscale':''">
+								<view class="relative" :class="userInfo.consumerMember&&userInfo.consumerMember.isRights?'':'grayscale'">
 									<image class="img-icon" :src="assetsPath+'/tag_icon_2.png'" mode="widthFix"></image>
 									<view class="absolute">
 										<text class="text-1">权益会员</text>
 									</view>
 								</view>
 							</view>
-							<view v-if="userInfo.memberConfig && ( userInfo.memberConfig.memberType ==1 || userInfo.memberConfig.memberType ==2) " class="tip-date">
-								<text>{{userInfo.consumerMember.expirationDate}}到期</text>
+							<view v-if="userInfo.consumerMember.isRights" class="tip-date">
+								<text>权益{{userInfo.consumerMember.expirationDate}}到期</text>
 							</view>
 						</view>
 						<view class="nav-right" @tap.stop="onNavToSetUserInfo">

pages/vipCreate/vipCreate.vue

@@ -402,15 +402,9 @@
 				getUserInfo().then(res => {
 					if (res.data.code == 200) {
 						this.userInfo = res.data.data;
-						if (res.data.data.consumerMember && res.data.data.consumerMember.memberType == 2) {
-
-							let expirationDate = moment(res.data.data.consumerMember.expirationDate).valueOf();
-							let nowDate = moment().valueOf()
-							if (nowDate <= expirationDate) {
-								this.consumerMemberStatus = true;
-							}
+						if (this.userInfo.consumerMember && this.userInfo.consumerMember.isRights ) {
+                            this.consumerMemberStatus = true;
 						}
-
 					}
 				})
 			},