问题修复

pages.json

@@ -206,7 +206,7 @@
 			"path" : "pages/user/member/czzx-shop-list",
 			"style" : 
 			{
-				"navigationBarTitleText" : ""
+				"navigationBarTitleText" : "适用门店"
 			}
 		}
 	],

pages/order/confirm-order.vue

@@ -50,7 +50,9 @@
 			@changeFree="changeFree">
 		</rechargeFree>
 		<!-- 充值享优惠 -->
-		<ChargeVue @updateChargeSel="updateChargeSel" @updateRechargeId="updateRechargeId" v-else></ChargeVue>
+		<view v-else>
+			<ChargeVue @updateChargeSel="updateChargeSel" @updateRechargeId="updateRechargeId"  v-if="(listinfo.status == 'unpaid'||!listinfo.id)"></ChargeVue>
+		</view>
 		<!-- 支付方式 -->
 		<paymentMethodes ref="paymentMethodref" :orderVIP="orderVIP" @groupChange="groupChange"
 			:changeFreeenable="isBwc" v-if="listinfo.status == 'unpaid'||!listinfo.id">

pages/user/member/czzx-shop-list.vue

@@ -20,10 +20,14 @@
 		reactive,
 		ref
 	} from 'vue';
+	import {
+		onLoad
+	} from '@dcloudio/uni-app';
 
 	const list = ref([])
 	const query = reactive({
-		shopName: ''
+		shopName: '',
+		shopId:''
 	})
 	async function getData() {
 		const res = await shopList(query)
@@ -38,12 +42,14 @@
 			icon: 'none'
 		})
 	}
-
-	function toDetail(item) {
-		uni.navigateTo({
-			url: '/pages/user/member/billDetails?type=2&shopId=' + item.shopId
+	onLoad((opt) => {
+		Object.assign(query, opt)
 	})
-	}
+	// function toDetail(item) {
+	// 	uni.navigateTo({
+	// 		url: '/pages/user/member/billDetails?type=2&shopId=' + item.shopId
+	// 	})
+	// }
 	onMounted(getData)
 </script>
 

pages/user/member/czzx.vue

@@ -141,7 +141,7 @@
 	
 	function toShopList(){
 		uni.navigateTo({
-			url:'/pages/user/member/czzx-shop-list'
+			url:'/pages/user/member/czzx-shop-list?shopId='+option.shopId
 		})
 	}
 

user/vip/buy-vip.vue

@@ -8,7 +8,8 @@
 					<view class="u-p-l-20">
 						<view class="shop-name u-line-1">{{shopInfo.shopName||'店铺名称' }}</view>
 						<view class="u-flex">
-							<view class="no-buy">暂未开通</view>
+							<view class="no-buy" v-if="!shopUserInfo.isVip">暂未开通</view>
+							<view class="has-buy" v-else>已开通</view>
 						</view>
 					</view>
 				</view>
@@ -460,6 +461,15 @@
 			color: #999;
 			text-align: center;
 		}
+		.has-buy {
+			margin-top: 12rpx;
+			padding: 8rpx 22rpx;
+			border-radius: 50rpx;
+			background-color: #FFD158;
+			font-size: 14px;
+			color: #333;
+			text-align: center;
+		}
 	}
 
 	.vip-box {

user/vip/vip.vue

@@ -19,12 +19,12 @@
 							<text class="font-16">{{memberLevel? memberLevel.experience:''}}</text>
 							<text class="font-12">经验值</text>
 						</text>
-						<text class="desc">等级说明</text>
+						<text class="desc" @click="modelShow('等级说明')">等级说明</text>
 					</view>
 					<view class="progress">
 						<view class="block" :style="{width:expProgress+'%'}"></view>
 					</view>
-					<view class="u-m-t-12 next-tips" v-if="expProgress<100&&nextName">
+					<view class="u-m-t-12 next-tips" v-if="expProgress*1<100&&nextName">
 						还差{{memberLevel?memberLevel.nextExperienceValue:''}}成长值可以升级到{{nextName}}</view>
 				</view>
 
@@ -61,11 +61,11 @@
 				每消费1元获得{{state.costReward||''}}成长值
 			</view>
 			<view class="color-666 font-14 u-m-t-16">
-				每消费1元获得{{state.rechargeReward||''}}成长值
+				每充值1元获得{{state.rechargeReward||''}}成长值
 			</view>
 		</view>
 
-
+	<button class="buy-btn" @click="toXufei">立即续费</button>
 
 		<up-popup :show="model.show" mode="center" round="16rpx" close-on-click-overlay @close="model.show=false">
 			<view class="model-box">
@@ -105,6 +105,12 @@
 		model.show = false;
 	}
 	
+	function toXufei(){
+		uni.navigateTo({
+			url:'/user/vip/buy-vip?shopId='+option.shopId
+		})
+	}
+
 	function modelShow(name) {
 		if (name == '消费送积分') {
 			model.title = '消费送积分'
@@ -119,6 +125,10 @@
 			model.title = '会员说明'
 			modelContent.value = state.remark
 		}
+		if (name == '等级说明') {
+			model.title = '等级说明'
+			modelContent.value = memberLevel.value.remark||''
+		}
 		model.show = true;
 	}
 	const modelContent = ref(``)
@@ -287,7 +297,8 @@
 			return null
 		}
 		
-		const index=memberLevelList.value.find(v=>v.id==memberLevel.value.id)
+		const index=memberLevelList.value.findIndex(v=>v.id==memberLevel.value.id)
+		console.log(index);
 		if(index!=-1||index>=memberLevelList.value.length-1){
 			return null
 		}
@@ -445,4 +456,16 @@
 		color: #999;
 		font-size: 12px;
 	}
+	.buy-btn {
+		
+		margin: 98rpx 48rpx 48rpx 48rpx;
+		padding: 32rpx 32rpx;
+		color: #fff;
+		font-size: 16px;
+		font-weight: 700;
+		border-radius: 80rpx;
+		line-height: 1;
+		background: linear-gradient(98deg, #fe6d1100 40.64%, #FFD1B4 105.2%), linear-gradient(259deg, #FE6D11 50.14%, #FFD1B4 114.93%);
+		box-shadow: 0 14rpx 30.4rpx 0 #fe8b435e;
+	}
 </style>