From 5ce56b70301506bc5a2021cb87e834d6e0ef0d4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AD=8F=E5=95=BE?= <1144797966@qq.com>
Date: Thu, 30 May 2024 11:00:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E6=83=A0shopId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.vue  |  2 +-
 pages/member/index.vue | 33 ++++++++++++++++-----------------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index 6f8b82f..390c272 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -385,7 +385,7 @@
 						this.seighT = data.windowHeight;
 						this.$u.getRect('.fourcontent').then(res => {
 							console.log(res.top)
-							this.Topdistance = res.top - res.height //滚动距离
+							this.Topdistance = res.top - res.height - 20 //滚动距离
 						})
 					}
 				})
diff --git a/pages/member/index.vue b/pages/member/index.vue
index 41cb51b..4101f25 100644
--- a/pages/member/index.vue
+++ b/pages/member/index.vue
@@ -22,22 +22,24 @@
 <script>
 	import card from './components/card.vue'
 	export default {
-	components:{card},
+		components: {
+			card
+		},
 		data() {
 			return {
 				inputshow: 0,
-				memberlist: {},
 				listdata: [],
 				amount: '',
-				shopUser: {},
-				userInfo: {}
+				userInfo: {},
+				shopId: ''
 			}
 		},
 		onLoad(e) {
-			console.log(e,'调试2')
-			if (e.type == 'list') {//从列表进来的
+			console.log(e, '调试2')
+			this.shopId = e.shopId
+			if (e.type == 'list') { //从列表进来的
 				this.paygetShopByMember(e.shopId)
-			}else{
+			} else {
 				this.paygetShopByMember(e.shopId)
 			}
 			this.paygetActive(e.shopId) //列表
@@ -54,7 +56,7 @@
 			},
 			async paygetActive(shopid) {
 				let res = await this.api.paygetActive({
-					shopId:shopid,
+					shopId: shopid,
 					page: 1,
 					pageSize: 10
 				})
@@ -74,7 +76,7 @@
 					return false;
 				}
 				let res = await this.api.paymemeberIn({
-					shopId: uni.cache.get('shopUser'), // 判断显示哪家的作品,
+					shopId: this.shopId, // 判断显示哪家的作品,
 					amount: this.amount // 判断显示哪家的作品,
 				})
 				if (res) {
@@ -113,11 +115,6 @@
 				this.inputshow = b
 				this.amount = a.minNum
 			},
-			eeInfo(e) {
-				uni.pro.navigateTo('my/member/memberinfo', {
-					id: e,
-				})
-			},
 		}
 	}
 </script>
@@ -209,7 +206,8 @@
 				font-weight: 400;
 				color: #422A07;
 			}
-			.towcontentitevip{
+
+			.towcontentitevip {
 				position: absolute;
 				right: 0;
 				top: 0;
@@ -221,10 +219,11 @@
 				text-align: center;
 				line-height: 40rpx;
 				color: #fff;
-				font-family:Source Han Sans CN-Medium;
+				font-family: Source Han Sans CN-Medium;
 				font-weight: Medium;
-				
+
 			}
+
 			.towcontentitemthere {
 				margin-left: 92rpx;
 				font-family: Source Han Sans CN, Source Han Sans CN;