From 02faeccc96c64624e97b7575f5806ce82aa31fc0 Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Thu, 20 Jun 2024 13:45:12 +0800
Subject: [PATCH] add

---
 pages/index/index.vue | 6 ++----
 pages/login/login.vue | 4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index cbaa954..a8423e3 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -269,8 +269,6 @@
 	let lastScollTop = 0
 	const hideHeadView = (e) => {
 		if (e.detail.scrollTop < 100) return
-		console.log(e.detail.scrollTop, scoHeight, targetHeight.value)
-		// if (targetHeight.value < 200) return
 		if (e.detail.scrollTop <= 0 || e.detail.scrollTop > targetHeight.value)
 			return
 		isScroll.value = e.detail.scrollTop > lastScollTop
@@ -577,7 +575,6 @@
 		where.value.store_id = opt.id || STORE_INFO.id;
 		// 店铺id
 		if (opt.id) {
-			console.log('opt', opt)
 			where.value.store_id = opt.id;
 			const info = await shopDetailApi({
 				store_id: opt.id
@@ -592,8 +589,10 @@
 		}
 		getgoodClassList(0);
 		getGoodList();
+		// #ifndef H5
 		// 胶囊布局信息
 		btns.value = uni.getMenuButtonBoundingClientRect();
+		// #endif
 	})
 
 	onShow(() => {
@@ -622,7 +621,6 @@
 				scrollOffset: true,
 			},
 			(data) => {
-				console.log(data)
 				scoHeight = data.scrollHeight
 				targetHeight.value = data.scrollHeight - data.height
 			}
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 35ce671..7e22e2e 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -16,10 +16,10 @@
 						<up-button @click="weixinLogin" color="#20B128" size="large"><up-icon name="weixin-fill"
 								color="#fff" size="28"></up-icon>微信快捷登录</up-button>
 					</view>
-					<!-- <view class="btn">
+					<view class="btn">
 						<up-button @click="navgo('/pages/login/test')" color="#20B128" size="large"><up-icon
 								name="weixin-fill" color="#fff" size="28"></up-icon>账号登录</up-button>
-					</view> -->
+					</view>
 					<!-- <view class="btn">
             <up-button @click="officialCode" color="#20B128" size="large"><up-icon name="weixin-fill" color="#fff"
                 size="28"></up-icon>公众号授权</up-button>