From 6ef701651bd11deb7cbc18dd3e6fdf2571e0c36a Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Tue, 5 Sep 2023 09:09:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=BB=91=E5=8A=A8=E9=A1=B6?=
 =?UTF-8?q?=E9=83=A8=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/gather/gather.vue               | 54 ++++++++++++------------
 pages/index/index.vue                 | 51 +++++++++++------------
 pages/supply_chains/supply_chains.vue | 59 ++++++++++-----------------
 3 files changed, 71 insertions(+), 93 deletions(-)

diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue
index 8b22336..4cd438d 100644
--- a/pages/gather/gather.vue
+++ b/pages/gather/gather.vue
@@ -1,29 +1,25 @@
 <template>
   <view class="gather">
     <view @click="selectLocation" v-if="isFshow">
-      <view
-        class="site-box flex_a_c_j_sb"
-        :style="{ 'background-color': backColor }"
-      >
-        <view :class="['place_wrapper', 'flex_a_c', isFshow ? 'sitebox' : '']">
-          <view
-            :class="['iconfont', 'icon-weizhi', isFshow ? 'sitebox' : '']"
-            style="margin-left: 20rpx"
-          >
-          </view>
-          <view class="town_name">{{ street }}</view>
-        </view>
-        <navigator
-          url="/pages/chat/customer_list/index?type=0"
-          hover-class="none"
-        >
-          <view
-            :class="['iconfont', 'icon-xiaoxi', isFshow ? 'sitebox' : '']"
-            style="color: #fff"
-          ></view>
-        </navigator>
+     
+      	<view class="site-box flex_a_c_j_sb" :style="{'background-color':backColor}">
+      
+      		<view :class="['place_wrapper','flex_a_c',isFshow?'sitebox':'']" @click="selectLocation">
+      			<view :class="['iconfont','icon-weizhi',isFshow?'sitebox':'']" style="color:#000;margin-left: 20rpx;">
+      			</view>
+      			<view class="town_name" style="color:#000;">{{street}}</view>
+      		</view>
+      		<navigator url="/pages/chat/customer_list/index?type=0" hover-class="none">
+      			<view :class="['iconfont','icon-xiaoxi',isFshow?'sitebox':'']" style="color:#000;"></view>
+      		</navigator>
+      	</view>
+      	<!-- <view class="site-box ','flex_a_c_j_sb'" v-if="ishshow">
+      		<view class="bg-img">
+      			<img :src="bgColor" alt="">
+      		</view>
+      	</view> -->
+      
       </view>
-    </view>
 
     <zbpSwiper
       :isSelectPlace="true"
@@ -189,7 +185,7 @@ export default {
       columnData: [],
       bgColor: '',
       isFshow: false,
-      backColor: 'rgba(248, 66, 33, 0)'
+      backColor: 'rgba(252, 252, 252, 0)'
     };
   },
   computed: {
@@ -240,13 +236,13 @@ export default {
   onPageScroll (e) {
     const scrollTop = e.scrollTop;
     if (scrollTop <= 20) {
-      this.backColor = 'rgba(248, 66, 33, 0)'
+      this.backColor = 'rgba(252, 252, 252, 0)'
       this.isFshow = false
     } else if (20 < scrollTop && scrollTop <= 100) {
-      this.backColor = 'rgba(248, 66, 33, .5)'
+      this.backColor = 'rgba(252, 252, 252, .5)'
       this.isFshow = true
     } else if (scrollTop > 100) {
-      this.backColor = 'rgba(248, 66, 33, 1)'
+      this.backColor = 'rgba(252, 252, 252, 1)'
       this.isFshow = true
 
 
@@ -283,13 +279,13 @@ export default {
 
 
       if (scrollTop <= 20) {
-        this.backColor = 'rgba(248, 66, 33, 0)'
+        this.backColor = 'rgba(252, 252, 252, 0)'
         this.isFshow = false
       } else if (20 < scrollTop && scrollTop <= 100) {
-        this.backColor = 'rgba(248, 66, 33, .5)'
+        this.backColor = 'rgba(252, 252, 252, .5)'
         this.isFshow = true
       } else if (scrollTop > 100) {
-        this.backColor = 'rgba(248, 66, 33, 1)'
+        this.backColor = 'rgba(252, 252, 252, 1)'
         this.isFshow = true
 
 
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 7f25d1b..a76ee01 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -5,12 +5,12 @@
 				<view class="site-box flex_a_c_j_sb" :style="{'background-color':backColor}">
 
 					<view :class="['place_wrapper','flex_a_c',isFshow?'sitebox':'']" @click="selectLocation">
-						<view :class="['iconfont','icon-weizhi',isFshow?'sitebox':'']" style="margin-left: 20rpx;">
+						<view :class="['iconfont','icon-weizhi',isFshow?'sitebox':'']" style="color:#000;margin-left: 20rpx;">
 						</view>
-						<view class="town_name">{{street}}</view>
+						<view class="town_name" style="color:#000;">{{street}}</view>
 					</view>
 					<navigator url="/pages/chat/customer_list/index?type=0" hover-class="none">
-						<view :class="['iconfont','icon-xiaoxi',isFshow?'sitebox':'']" style="color:#fff;"></view>
+						<view :class="['iconfont','icon-xiaoxi',isFshow?'sitebox':'']" style="color:#000;"></view>
 					</navigator>
 				</view>
 				<!-- <view class="site-box ','flex_a_c_j_sb'" v-if="ishshow">
@@ -215,7 +215,7 @@
 				streeta_id: '',
 				street: '',
 				bgColor: '',
-				backColor: 'rgba(248, 66, 33, 0)',
+				backColor: 'rgba(252, 252, 252, 0)',
 				isFshow: false,
 				scrollTop: 0,
 				show: true
@@ -257,7 +257,7 @@
 		onReachBottom() {
 			if (this.status == 'nomore') return;
 			this.status = 'loading';
-			
+
 			this.where.page = ++this.where.page;
 			this.getGoods()
 		},
@@ -282,15 +282,15 @@
 			// 导航条颜色透明渐变
 
 			if (scrollTop <= 20) {
-				this.backColor = 'rgba(248, 66, 33, 0)'
+				this.backColor = 'rgba(252, 252, 252, 0.0)'
 				this.isFshow = false
 				this.show = true
 			} else if (20 < scrollTop && scrollTop <= 100) {
-				this.backColor = 'rgba(248, 66, 33, .5)'
+						this.backColor = 'rgba(255, 255, 255, 0.5)'
 				this.isFshow = true
 				this.show = false
 			} else if (scrollTop > 100) {
-				this.backColor = 'rgba(248, 66, 33, 1)'
+		     this.backColor = 'rgba(252, 252, 252, 1.0)'
 				this.isFshow = true
 				this.show = false
 			}
@@ -312,7 +312,6 @@
 				// console.log("header 滚动距离 ", scrollTop);
 				// 更新——滚动前，滚动条距文档顶部的距离
 				this.oldScrollTop = scrollTop;
-
 				//变量windowHeight是可视区的高度
 				let windowHeight =
 					document.documentElement.clientHeight || document.body.clientHeight;
@@ -325,15 +324,14 @@
 					//你想做的事情
 					// console.log("header  你已经到底部了");
 				}
-
 				if (scrollTop <= 20) {
-					this.backColor = 'rgba(248, 66, 33, 0)'
+					this.backColor = 'rgba(252, 252, 252, 0.0)'
 					this.isFshow = false
 				} else if (20 < scrollTop && scrollTop <= 100) {
-					this.backColor = 'rgba(248, 66, 33, .5)'
+					this.backColor = 'rgba(255, 255, 255, 0.5)'
 					this.isFshow = true
 				} else if (scrollTop > 100) {
-					this.backColor = 'rgba(248, 66, 33, 1)'
+					this.backColor = 'rgba(252, 252, 252, 1.0)'
 					this.isFshow = true
 
 
@@ -402,7 +400,7 @@
 
 				this.street = e.value[1].name
 		
-	this.$nextTick(() => {
+	     this.$nextTick(() => {
 				this.$bus.$emit('value-updated',e.value[1].name + ',' +e.value[1].code);
 				
 				})
@@ -485,19 +483,19 @@
 
 					if (this.where.page == 1 && res.data.list.length <= 0) this.emptyShow = true
 
-					if (item) {
+					// if (item) {
 
-						if (item.index == 1 && this.cateGoods[0]) {
-							uni.navigateTo({
-								// #ifdef MP || H5
-								url: `/pages/short_video/nvueSwiper/index?id=${this.cateGoods[0].community_id}`
-								// #endif
-								// #ifdef APP
-								url: `/pages/short_video/appSwiper/index?id=${this.cateGoods[0].community_id}`
-								// #endif
-							})
-						}
-					}
+					// 	if (item.index == 1 && this.cateGoods[0]) {
+					// 		uni.navigateTo({
+					// 			// #ifdef MP || H5
+					// 			url: `/pages/short_video/nvueSwiper/index?id=${this.cateGoods[0].community_id}`
+					// 			// #endif
+					// 			// #ifdef APP
+					// 			url: `/pages/short_video/appSwiper/index?id=${this.cateGoods[0].community_id}`
+					// 			// #endif
+					// 		})
+					// 	}
+					// }
 
 				})
 			},
@@ -532,7 +530,6 @@
 					type: 'wgs84',
 					timeout: '10',
 					success: (res) => {
-						
 						this.isshow = false
 						let latitude, longitude;
 						latitude = res.latitude.toString();
diff --git a/pages/supply_chains/supply_chains.vue b/pages/supply_chains/supply_chains.vue
index b6a5c19..d2a8333 100644
--- a/pages/supply_chains/supply_chains.vue
+++ b/pages/supply_chains/supply_chains.vue
@@ -1,37 +1,22 @@
 <template>
   <view class="Circle_friends">
     <view class="circle_friends_wrapper">
-      <view @click="selectLocation" v-if="isFshow">
-        <view
-          class="site-box flex_a_c_j_sb"
-          :style="{ 'background-color': backColor }"
-        >
-          <view
-            :class="['place_wrapper', 'flex_a_c', isFshow ? 'sitebox' : '']"
-          >
-            <view
-              :class="['iconfont', 'icon-weizhi', isFshow ? 'sitebox' : '']"
-              style="margin-left: 20rpx"
-            >
-            </view>
-            <view class="town_name">{{ street }}</view>
-          </view>
-          <navigator
-            url="/pages/chat/customer_list/index?type=0"
-            hover-class="none"
-          >
-            <view
-              :class="['iconfont', 'icon-xiaoxi', isFshow ? 'sitebox' : '']"
-              style="color: #fff"
-            ></view>
-          </navigator>
-        </view>
-        <!-- <view class="site-box ','flex_a_c_j_sb'" v-if="ishshow">
-				<view class="bg-img">
-					<img :src="bgColor" alt="">
-				</view>
-			</view> -->
+      <view v-if="isFshow">
+      	<view class="site-box flex_a_c_j_sb" :style="{'background-color':backColor}">
+      
+      		<view :class="['place_wrapper','flex_a_c',isFshow?'sitebox':'']" @click="selectLocation">
+      			<view :class="['iconfont','icon-weizhi',isFshow?'sitebox':'']" style="color:#000;margin-left: 20rpx;">
+      			</view>
+      			<view class="town_name" style="color:#000;">{{street}}</view>
+      		</view>
+      		<navigator url="/pages/chat/customer_list/index?type=0" hover-class="none">
+      			<view :class="['iconfont','icon-xiaoxi',isFshow?'sitebox':'']" style="color:#000;"></view>
+      		</navigator>
+      	</view>
+      	
+      
       </view>
+    
 
       <zbpSwiper
         :isSelectPlace="true"
@@ -255,7 +240,7 @@ export default {
 			street: '',
 			bgColor: '',
 			isFshow: false,
-			backColor: 'rgba(248, 66, 33, 0)'
+			backColor: 'rgba(252, 252, 252, 0)'
 		}
 	},
 
@@ -320,13 +305,13 @@ export default {
 
 		const scrollTop = e.scrollTop;
 		if (scrollTop <= 20) {
-			this.backColor = 'rgba(248, 66, 33, 0)'
+			this.backColor = 'rgba(252, 252, 252, 0)'
 			this.isFshow = false
 		} else if (20 < scrollTop && scrollTop <= 100) {
-			this.backColor = 'rgba(248, 66, 33, .5)'
+			this.backColor = 'rgba(252, 252, 252, .5)'
 			this.isFshow = true
 		} else if (scrollTop > 100) {
-			this.backColor = 'rgba(248, 66, 33, 1)'
+			this.backColor = 'rgba(252, 252, 252, 1)'
 			this.isFshow = true
 
 
@@ -382,13 +367,13 @@ export default {
 
 
 			if (scrollTop <= 20) {
-				this.backColor = 'rgba(248, 66, 33, 0)'
+				this.backColor = 'rgba(252, 252, 252, 0)'
 				this.isFshow = false
 			} else if (20 < scrollTop && scrollTop <= 100) {
-				this.backColor = 'rgba(248, 66, 33, .5)'
+				this.backColor = 'rgba(252, 252, 252, .5)'
 				this.isFshow = true
 			} else if (scrollTop > 100) {
-				this.backColor = 'rgba(248, 66, 33, 1)'
+				this.backColor = 'rgba(252, 252, 252, 1)'
 				this.isFshow = true