diff --git a/pages.json b/pages.json index ee3f78d..2bea098 100644 --- a/pages.json +++ b/pages.json @@ -206,7 +206,7 @@ "path" : "pages/user/member/czzx-shop-list", "style" : { - "navigationBarTitleText" : "" + "navigationBarTitleText" : "适用门店" } } ], diff --git a/pages/order/confirm-order.vue b/pages/order/confirm-order.vue index a48d532..0475591 100644 --- a/pages/order/confirm-order.vue +++ b/pages/order/confirm-order.vue @@ -50,7 +50,9 @@ @changeFree="changeFree"> - + + + diff --git a/pages/user/member/czzx-shop-list.vue b/pages/user/member/czzx-shop-list.vue index 9d71a6b..04a2807 100644 --- a/pages/user/member/czzx-shop-list.vue +++ b/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) diff --git a/pages/user/member/czzx.vue b/pages/user/member/czzx.vue index 4455924..003ad30 100644 --- a/pages/user/member/czzx.vue +++ b/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 }) } diff --git a/user/vip/buy-vip.vue b/user/vip/buy-vip.vue index 9f1108a..56c6d56 100644 --- a/user/vip/buy-vip.vue +++ b/user/vip/buy-vip.vue @@ -8,7 +8,8 @@ {{shopInfo.shopName||'店铺名称' }} - 暂未开通 + 暂未开通 + 已开通 @@ -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 { diff --git a/user/vip/vip.vue b/user/vip/vip.vue index a612812..2c03ac9 100644 --- a/user/vip/vip.vue +++ b/user/vip/vip.vue @@ -19,12 +19,12 @@ {{memberLevel? memberLevel.experience:''}} 经验值 - 等级说明 + 等级说明 - + 还差{{memberLevel?memberLevel.nextExperienceValue:''}}成长值可以升级到{{nextName}} @@ -61,11 +61,11 @@ 每消费1元获得{{state.costReward||''}}成长值 - 每消费1元获得{{state.rechargeReward||''}}成长值 + 每充值1元获得{{state.rechargeReward||''}}成长值 - + @@ -104,6 +104,12 @@ function modelHide() { model.show = false; } + + function toXufei(){ + uni.navigateTo({ + url:'/user/vip/buy-vip?shopId='+option.shopId + }) + } function modelShow(name) { if (name == '消费送积分') { @@ -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; + } \ No newline at end of file