调整

pages/discountCard/productDetails.vue

@@ -630,6 +630,10 @@
 		},
 		computed: {
 			isPayText(){
+				var memberLevel=1
+				if(this.userInfo.memberLevel){
+					memberLevel=this.userInfo.memberLevel
+				}
 				var text=""
 				if(this.cardList.length==0){
 					text="未上架"
@@ -647,6 +651,8 @@
 					text="关注公众号"
 				}else if(!this.infoSet){
 					text="完善个人信息"
+				}else if(this.detail.memberLevel&&this.detail.memberLevel>memberLevel){
+					text=this.detail.memberLevelStr+"以上可购买"
 				}
 				
 				return text

pages/monthlyCardActivity/monthlyCardBuy.vue

@@ -316,6 +316,9 @@
 			</button>
 			<button class="btn " v-else-if="userInfo.userType=='1'">游客无法购买月卡
 			</button>
+			<button class="btn " v-else-if="detail.memberLevel&&detail.memberLevel>(userInfo.memberLevel?userInfo.memberLevel:1)" >{{detail.memberLevelStr}}以上可购买
+			</button>
+			
 			<button class="btn " v-else-if="!isReady">加载中
 			</button>
 			<button class="btn " v-else-if="ispay"> {{userCard&&ispay?userCard.endTime:''}}到期

pages/user/index.vue

@@ -2,7 +2,9 @@
 	<view>
 		<view class="header">
 			<!-- 用户信息 -->
-			<view class="userinfo">
+			<view class="userinfo" :class="{
+				userinfo2:personInfo&&personInfo.userType==2
+			}">
 				<view class="infos" @click="toData"  >
 					<view class="head-portrait"  >
 						
@@ -28,11 +30,24 @@
 						</view>
 					</view>
 				</view>
-				<view class="right" v-if="false">
-					<!-- <i class="ri-notification-2-line">
-						<text class="unread">20</text>
-					</i> -->
-					<i class="ri-settings-line" @click="setUp"></i>
+				<view class="right"  v-if="personInfo&&personInfo.userType==2" >
+					<img src="@/assets/img/9-4/联盟会员.svg" v-if="personInfo.memberLevel==1||personInfo.memberLevel==null" >
+					<img src="@/assets/img/9-4/黄金会员.svg" v-if="personInfo.memberLevel==2" >
+					<img src="@/assets/img/9-4/铂金会员.svg" v-if="personInfo.memberLevel==3" >
+					
+					<view class="rightText rightTextA"  v-if="personInfo.memberLevel==1||personInfo.memberLevel==null">
+						<view class="rightText1">{{personInfo.memberLevelStr}}</view>
+						<view class="rightText2">可购买6折卡</view>
+						
+					</view>
+					<view class="rightText rightTextB"  v-if="personInfo.memberLevel==2">
+						<view class="rightText1">{{personInfo.memberLevelStr}}</view>
+						<view class="rightText2">可购买月卡</view>
+					</view>
+					<view class="rightText rightTextC"  v-if="personInfo.memberLevel==3">
+						<view class="rightText1">{{personInfo.memberLevelStr}}</view>
+						<view class="rightText2">可购买月卡</view>
+					</view>
 				</view>
 				
 			</view>
@@ -789,8 +804,8 @@
 
 				.name {
 					color: rgba(51, 51, 51, 100);
-					font-size: 20px;
-					line-height: 24px;
+					font-size: 40rpx;
+					line-height: 48rpx;
 				}
 
 				.change {
@@ -801,31 +816,53 @@
 
 			}
 
+			
+			
 			.right {
-				font-size: 24px;
-
-				.ri-notification-2-line {
+				display: flex;
+				align-items: center;
+				
+				img{
+					width: 96rpx;
+					height: 96rpx;
 					position: relative;
-
-					.unread {
-						width: 20px;
-						line-height: 14px;
-						border-radius: 24px;
-						background-color: rgba(255, 94, 0, 100);
-						color: rgba(255, 255, 255, 100);
-						font-size: 9px;
-						text-align: center;
-						position: absolute;
-						bottom: 14px;
-						left: 14px;
-					}
+					left: 48rpx;
 				}
-
-				.ri-settings-line {
-					margin-left: 16px;
+				.rightText{
+					    padding-left: 28rpx;
+					    display: flex;
+					    align-items: center;
+					    flex-wrap: wrap;
+					    justify-content: space-evenly;
+						align-content: center;
+					width: 188rpx;
+					height: 72rpx;
+					text-align: center;
+					//padding:12rpx 0;
+				}
+				.rightTextA{
+					background: linear-gradient(134.91deg, rgba(220,232,255,1) 29.61%,rgba(176,202,255,1) 99.85%);
+				}
+				.rightTextB{
+					background: linear-gradient(134.91deg, rgba(255,241,187,1) 29.61%,rgba(255,215,63,1) 99.85%);
+				}
+				.rightTextC{
+					background: linear-gradient(134.91deg, rgba(229,234,255,1) 21.58%,rgba(180,176,255,1) 98.85%);
+				}
+				.rightText1{
+					font-size: 24rpx;
+				
+				}
+				.rightText2{
+					opacity: 0.7;
+					color: rgba(0, 0, 0, 1);
+					font-size: 20rpx;
 				}
-
 			}
+			
+		}
+		.userinfo2 {
+			padding: 40rpx 0  32rpx 32rpx;
 		}
 		// 卡包入口
 		.my-infos{