diff --git a/common/api/market/recharge.js b/common/api/market/recharge.js index d033637..9fc3ad8 100644 --- a/common/api/market/recharge.js +++ b/common/api/market/recharge.js @@ -17,3 +17,10 @@ export const list = (data) => { data: data }) } +export const shopList = (data) => { + return request({ + url: prveUrl + '/user/recharge/config/shopList', + method: 'get', + data: data + }) +} diff --git a/components/paymentMethod.vue b/components/paymentMethod.vue index b766881..8b792d6 100644 --- a/components/paymentMethod.vue +++ b/components/paymentMethod.vue @@ -142,9 +142,19 @@ // 去充值 const goRecharge = () => { - uni.pro.navigateTo('user/member/index', { - shopId: orderVIP.value.shopId + if(orderVIP.value.isVip){ + uni.navigateTo({ + url:'/pages/user/member/czzx?shopId='+orderVIP.value.shopId + }) + return + } + uni.navigateTo({ + url:'/user/vip/buy-vip?shopId='+orderVIP.value.shopId }) + + // uni.pro.navigateTo('user/member/index', { + // shopId: orderVIP.value.shopId + // }) } // 将方法暴露给父组件 defineExpose({ diff --git a/pages.json b/pages.json index 2ff3cda..ee3f78d 100644 --- a/pages.json +++ b/pages.json @@ -201,6 +201,13 @@ "navigationBarTitleText": "", "navigationStyle": "custom" } + }, + { + "path" : "pages/user/member/czzx-shop-list", + "style" : + { + "navigationBarTitleText" : "" + } } ], "subPackages": [{ diff --git a/pages/order/components/orderInfo.vue b/pages/order/components/orderInfo.vue index ee1360c..5530e65 100644 --- a/pages/order/components/orderInfo.vue +++ b/pages/order/components/orderInfo.vue @@ -117,7 +117,7 @@ v-if="item.icon" :src="item.icon" mode=""> {{ item.name }} - + 「可用积分{{pointsRes.accountPoints}},最大可抵扣{{maxPointDiscount}}元」 diff --git a/pages/user/member/czzx-shop-list.vue b/pages/user/member/czzx-shop-list.vue new file mode 100644 index 0000000..9d71a6b --- /dev/null +++ b/pages/user/member/czzx-shop-list.vue @@ -0,0 +1,64 @@ + + + + + \ No newline at end of file diff --git a/pages/user/member/czzx.vue b/pages/user/member/czzx.vue index eff173e..4455924 100644 --- a/pages/user/member/czzx.vue +++ b/pages/user/member/czzx.vue @@ -85,7 +85,7 @@ 充值说明 适用门店 - 全国门店通用 {{'>'}} + 全国门店通用 {{'>'}} 有效期限 @@ -138,6 +138,12 @@ import { pay } from '@/utils/pay.js' + + function toShopList(){ + uni.navigateTo({ + url:'/pages/user/member/czzx-shop-list' + }) + } function couponNum(list) { return list.reduce((prve, cur) => { diff --git a/user/vip/buy-vip.vue b/user/vip/buy-vip.vue index f63219a..9f1108a 100644 --- a/user/vip/buy-vip.vue +++ b/user/vip/buy-vip.vue @@ -176,7 +176,7 @@ function modelShow(name) { if (name == '消费送积分') { model.title = '消费送积分' - modelContent.value = `每消耗1元赠送${memberLevel.value.costRewardPoints}积分` + modelContent.value = `每消耗${memberLevel.value.costRewardPoints}元赠送1积分` } if (name == '周期福利') { model.title = '周期福利' @@ -234,7 +234,7 @@ } ]) - const tiaojian_menus = [{ + let tiaojian_menus =ref( [{ name: '享会员价', desc: '全店会员价', icon: '/user/static/buy-vip/Frame_222.png' @@ -255,7 +255,7 @@ icon: '/user/static/buy-vip/Frame_225.png' } - ] + ]) function showQuestion(index, arr) { @@ -300,6 +300,10 @@ shopId: shopId }) if (res) { + if(!res.memberConfig.isMemberPrice){ + tiaojian_menus.value=tiaojian_menus.value.filter(v=>v.name!='享会员价') + pay_menus.value=pay_menus.value.filter(v=>v.name!='享会员价') + } if (res.memberConfig.isSubmitInfo && (shopUserInfo.value.sex === null || shopUserInfo.value.sex === undefined || !shopUserInfo.value.nickName || !shopUserInfo.value.birthDay || !shopUserInfo.value .phone)) {