优惠卷和商品卷

pages/user/member/index.vue

@@ -59,12 +59,12 @@
 
 		</view>
 
-		<view class="gift" v-if="infoForn.giftList && infoForn.giftList.length > 0">
+		<view class="gift" v-if="infoForn.couponList && infoForn.couponList.length > 0">
 			<view class="gift_title">您将获得：</view>
 			<view class="gift_list">
-				<view class="gift_list_item" v-for="(item,index) in infoForn.giftList" :key="index">
+				<view class="gift_list_item" v-for="(item,index) in infoForn.couponList" :key="index">
 					<text class="icon"></text>
-					<text class="text"> {{ item }} </text>
+					<text class="text"> {{ item.title }} </text>
 				</view>
 			</view>
 		</view>
@@ -94,7 +94,7 @@
 			</view>
 			<view class="recharge" @tap="$u.debounce(userbalancerechangesub, 500)">立即充值</view>
 		</view>
-		<registermember :show="infoForn.shopUserInfo.isVip == 1? false : true" :shopUserInfo="infoForn.shopUserInfo">
+		<registermember :memberOpen="infoForn.show" :shopUserInfo="infoForn.shopUserInfo">
 		</registermember>
 	</view>
 
@@ -122,12 +122,12 @@
 
 	const cardManageList = [{
 			name: "明细",
-			url: "member/billDetails",
+			url: "user/member/billDetails",
 			icon: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/menber/detail.png"
 		},
 		{
 			name: "管理",
-			url: "member/storedManage",
+			url: "user/member/storedManage",
 			icon: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/menber/manage.png"
 		}
 	]
@@ -141,10 +141,10 @@
 		giftAmount: 0,
 		shopUserInfo: {},
 		shopId: '',
-		giftList: [],
+		couponList: [],
 		type: "",
-		userInfo: ''
-
+		userInfo: '',
+		show: false
 	})
 
 
@@ -157,7 +157,7 @@
 		})
 		try {
 			infoForn.listdata = res;
-			infoForn.giftList = infoForn.listdata[0].gives;
+			infoForn.couponList = infoForn.listdata[0].couponList;
 			infoForn.giftAmount = infoForn.listdata[0].giftAmount
 			if (infoForn.type == 'topUpActivity') {
 				infoForn.amountChange()
@@ -206,7 +206,7 @@
 			})
 		} else {
 			infoForn.inputshow = '';
-			infoForn.giftList = [];
+			infoForn.couponList = [];
 			infoForn.giftAmount = '';
 		}
 
@@ -245,9 +245,16 @@
 
 	// * 进入明细\管理
 	const handleClick = (item) => {
-		uni.navigateTo({
-			url: `/pages/${item.url}?shopUserInfo=${JSON.stringify(infoForn.shopUserInfo)}`
+		console.log(item)
+		uni.pro.navigateTo(item.url, {
+			shopId: infoForn.shopId,
+			type: item.name == '明细' ? 1 : 2,
+			shopInfo: JSON.stringify(infoForn.userInfo.shopInfo)
 		})
+
+		// uni.navigateTo({
+		// 	url: `/pages/${item.url}?shopUserInfo=${JSON.stringify(infoForn.shopUserInfo)}`
+		// })
 	}
 	// * 是否同意协议
 	const radioChange = (n) => {
@@ -281,8 +288,9 @@
 
 	// 充值金额切换
 	const clickinput = (a, b) => {
+		console.log(a, b)
 		infoForn.inputshow = b;
-		infoForn.giftList = a.gives;
+		infoForn.couponList = a.couponList;
 		infoForn.amount = a.amount;
 		infoForn.giftAmount = a.giftAmount;
 	}
@@ -354,8 +362,7 @@
 			infoForn.userInfo = await APIshopUserInfo({
 				shopId: options.shopId
 			})
-
-			// shopUserInfo.shopExtend = res.shopExtend.member_bg
+			infoForn.show == infoForn.userInfo.isVip == 1 ? true : false
 
 		}
 		if (options.type) {