From 7278a1e109732f3514e39031ce1b4cbb8c526ebe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E5=B9=B3=E8=89=BA?= <52643018@qq.com>
Date: Sat, 11 Sep 2021 18:10:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                         | 3 ++-
 pages/discover/discoverdetails.vue | 2 +-
 pages/index/category/category.vue  | 5 ++++-
 pages/index/index/index.vue        | 8 ++++++++
 pages/user/agreement/agreement.vue | 1 +
 pages/user/my/center.vue           | 4 +++-
 6 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/pages.json b/pages.json
index 94f1d22..00d2d70 100644
--- a/pages.json
+++ b/pages.json
@@ -8,7 +8,8 @@
 			"style": {
 				"navigationBarTitleText": "首页",
 				"enablePullDownRefresh":true,
-				"navigationStyle": "custom"
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "white"
 			}
 		},
 		{
diff --git a/pages/discover/discoverdetails.vue b/pages/discover/discoverdetails.vue
index 0a79e67..878fd57 100644
--- a/pages/discover/discoverdetails.vue
+++ b/pages/discover/discoverdetails.vue
@@ -129,7 +129,7 @@
 		<!-- 底部tab -->
 		<view class="comment-tab">
 			<view>
-				<input class="rom-search" type="text" placeholder="说点什么" />
+				<input class="rom-search" type="text" :cursor-spacing="8" placeholder="说点什么" />
 			</view>
 			<view class="lf-row-center">
 				<view class="lf-row-center lf-m-r-35">
diff --git a/pages/index/category/category.vue b/pages/index/category/category.vue
index 987f221..b3eb95e 100644
--- a/pages/index/category/category.vue
+++ b/pages/index/category/category.vue
@@ -30,7 +30,7 @@
 						</view>
 					</view>
 				</block>
-				<view class="" :style="{ height: 'calc('+ scrollH / 2 +'px)' }"><!-- 站位 --></view>
+				<view class="" :style="{ height: autoScrollHeight }"><!-- 站位 --></view>
 			</scroll-view>
 		</view>
 		<!-- 品牌 -->
@@ -109,6 +109,9 @@
 			otherHeight(){
 				// 屏幕可用总高度 - 导航条高度 - tabs高度 - tabbar高度 - 筛选高度
 				return `calc(${this.scrollH}px - ${this.nav_height}px - 90rpx - 120rpx - 105rpx)`;
+			},
+			autoScrollHeight(){
+				return `calc(${this.scrollH}px - ${this.nav_height}px - 90rpx - 120rpx - 300rpx)`;
 			}
 		},
 		components: {
diff --git a/pages/index/index/index.vue b/pages/index/index/index.vue
index d8147f6..d5f543e 100644
--- a/pages/index/index/index.vue
+++ b/pages/index/index/index.vue
@@ -579,8 +579,16 @@
 		onPageScroll(event){
 			if(event.scrollTop >= 100){
 				this.nav_bg_color = '#ffffff';
+				uni.setNavigationBarColor({
+					frontColor: "#000000",
+					backgroundColor: "#0000000"
+				})
 			}else{
 				this.nav_bg_color = 'transparent';
+				uni.setNavigationBarColor({
+					frontColor: "#ffffff",
+					backgroundColor: "#FFFFFF"
+				})
 			}
 		},
 		//下拉刷新
diff --git a/pages/user/agreement/agreement.vue b/pages/user/agreement/agreement.vue
index f49039e..f8b05d7 100644
--- a/pages/user/agreement/agreement.vue
+++ b/pages/user/agreement/agreement.vue
@@ -1,5 +1,6 @@
 <template>
 	<view class="agreement_index">
+		<lf-nav title="关于我们" :showIcon="true"></lf-nav>
 		<image src="https://picsum.photos/seed/picsum/200/300" class="logo"></image>
 		<view class="item" @tap="chageAgreement('privite')">
 			<view class="txt">隐私协议</view>
diff --git a/pages/user/my/center.vue b/pages/user/my/center.vue
index 5d11882..b43d808 100644
--- a/pages/user/my/center.vue
+++ b/pages/user/my/center.vue
@@ -15,7 +15,7 @@
 						<view class="lf-iconfont icon-xiangyou lf-font-24 lf-m-l-10 lf-color-white"></view>
 					</view>
 				</view>
-				<view class="lf-row-center lf-flex-column" @click="$url('/pages/user/member/code')">
+				<view class="lf-row-center lf-flex-column" style="position: relative; z-index: 9;" @click="$url('/pages/user/member/code')">
 					<view class="lf-iconfont icon-shoucang lf-color-white"></view>
 					<view class="lf-font-24 lf-color-white">支付码</view>
 				</view>
@@ -231,6 +231,8 @@
 	}
 	.center-tag {
 		padding: 0 80rpx 0 80rpx;
+		position: relative;
+		z-index: 9;
 	}
 	.ocupy {
 		height: 160rpx;