问题修复

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
+	})
+}

components/paymentMethod.vue

@@ -142,9 +142,19 @@
 
 	// 去充值
 	const goRecharge = () => {
-		uni.pro.navigateTo('user/member/index', {
+		if(orderVIP.value.isVip){
-			shopId: orderVIP.value.shopId
+			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({

pages.json

@@ -201,6 +201,13 @@
 				"navigationBarTitleText": "",
 				"navigationStyle": "custom"
 			}
+		},
+		{
+			"path" : "pages/user/member/czzx-shop-list",
+			"style" : 
+			{
+				"navigationBarTitleText" : ""
+			}
 		}
 	],
 	"subPackages": [{

pages/order/components/orderInfo.vue

@@ -117,7 +117,7 @@
 										v-if="item.icon" :src="item.icon" mode=""></u-image>
 								</view>
 								<text class="name u-m-l-16 no-wrap"> {{ item.name }} </text>
-								<text class="font-12" style="color: #666;margin-right: 16rpx;" v-if="item.type=='points'">
+								<text class="font-12 u-p-l-6" style="color: #666;margin-right: 16rpx;max-width: 360rpx;" v-if="item.type=='points'">
 									「可用积分{{pointsRes.accountPoints}}，最大可抵扣{{maxPointDiscount}}元」
 
 								</text>

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

@@ -0,0 +1,64 @@
+<template>
+	<view class="box">
+		<up-search v-model="query.shopName" @search="getData" @custom="getData"></up-search>
+		<view class="u-m-t-32">
+			<view class="u-flex list-item" v-for="(item,index) in list" :key="index">
+				<up-avatar size="84rpx" shape="square" round="16rpx" :src="item.logo"></up-avatar>
+				<view class=" u-p-l-16 color-333 font-14">{{item.shopName}}</view>
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script setup>
+	import {
+		shopList
+	} from '@/common/api/market/recharge.js'
+	import {
+		onMounted,
+		reactive,
+		ref
+	} from 'vue';
+
+	const list = ref([])
+	const query = reactive({
+		shopName: ''
+	})
+	async function getData() {
+		const res = await shopList(query)
+		if (res) {
+			list.value = res || []
+		}
+	}
+
+	function toDuihuan() {
+		uni.showToast({
+			title: '待开放！',
+			icon: 'none'
+		})
+	}
+
+	function toDetail(item) {
+		uni.navigateTo({
+			url: '/pages/user/member/billDetails?type=2&shopId=' + item.shopId
+		})
+	}
+	onMounted(getData)
+</script>
+
+<style lang="scss" scoped>
+	.box {
+		padding: 32rpx 28rpx;
+	}
+
+	.color-1 {
+		color: #FF6300;
+	}
+
+	.list-item {
+		align-items: center;
+		padding: 36rpx 0;
+		border-bottom: 1px solid #EDEDED;
+	}
+</style>

pages/user/member/czzx.vue

@@ -85,7 +85,7 @@
 				<view>充值说明</view>
 				<view class="u-m-t-16">
 					<text>适用门店</text>
-					<text class="color2 u-m-l-28">全国门店通用 {{'>'}} </text>
+					<text class="color2 u-m-l-28" @click="toShopList">全国门店通用 {{'>'}} </text>
 				</view>
 				<view class="u-m-t-16">
 					<text>有效期限</text>
@@ -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) => {

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)) {