From 4d4e22ce41795ca2f3f5f318091cfd0e33baba32 Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Tue, 12 Sep 2023 22:12:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                         |  4 ++--
 pages/gather/gather.vue               | 28 +++++++++++++++++----------
 pages/index/index.vue                 | 13 ++++++++-----
 pages/supply_chains/supply_chains.vue |  2 +-
 4 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/manifest.json b/manifest.json
index 92ddd3b..00680c0 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "惠农生活",
     "appid" : "__UNI__3A527D1",
     "description" : "",
-    "versionName" : "1.3.5",
-    "versionCode" : 135,
+    "versionName" : "1.3.6",
+    "versionCode" : 136,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue
index e8fbae7..e600f37 100644
--- a/pages/gather/gather.vue
+++ b/pages/gather/gather.vue
@@ -2,17 +2,23 @@
 	<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':'']" @click="selectLocation">
-					<view :class="['iconfont','icon-weizhi',isFshow?'sitebox':'']"
-						style="color:#000;margin-left: 20rpx;">
+			<view v-if="isFshow">
+				<view class="site-box flex_a_c_j_sb" :style="{ 'opacity': backColor,}">
+					<view :class="['place_wrapper', 'flex_a_c', isFshow ? 'sitebox' : '']" @click="selectLocation">
+						<view :class="['iconfont', 'icon-weizhi', isFshow ? 'sitebox' : '']"
+							style=" margin-left: 20rpx">
+						</view>
+						<view class="town_name">{{ street }}</view>
 					</view>
-					<view class="town_name" style="color:#000;">{{street}}</view>
+					<navigator url="/pages/chat/customer_list/index?type=0" hover-class="none">
+						<view :class="['iconfont', 'icon-xiaoxi', isFshow ? 'sitebox' : '']"></view>
+					</navigator>
 				</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 class="site-box ','flex_a_c_j_sb'" v-if="ishshow">
+					<view class="bg-img">
+						<img :src="bgColor" alt="">
+					</view>
+				</view> -->
 			</view>
 			<!-- <view class="site-box ','flex_a_c_j_sb'" v-if="ishshow">
       		<view class="bg-img">
@@ -476,7 +482,9 @@ this.editFlag = false;
 		/* #ifdef H5 */
 		padding-top: 25rpx;
 		/* #endif */
-
+	// background-color: #e5e5e5;
+		background: url('@/static/images/bg2.png') no-repeat;
+		background-size: 100% 100%;
 		padding-right: 20rpx;
 
 		// 位置
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 841f400..89b9260 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -34,7 +34,7 @@
 						<image src="@/static/images/zk.png" mode=""></image>
 					</view> -->
 
-				<view class="" style="width: 650rpx;">
+				<view class="" style="width: 670rpx;">
 					<u-tabs :list="tabsData.list" @click="tabsChange" itemStyle=" height: 33px;" lineColor="#F84221"
 					 :current="current"	keyName="cate_name" :activeStyle="activeStyle"></u-tabs>
 				</view>
@@ -603,7 +603,7 @@
 				}, ...data]
 			},
 			tabsChange(item) {
-				console.log(item)
+			
 				this.productList = []
 				this.where.category_id = item.category_id
 				this.emptyShow = false
@@ -965,6 +965,7 @@
 
 	.tabs_wrapper {
 		width: 720rpx;
+		
 		margin: 0 auto;
 		margin-bottom: 21.05rpx;
 		// margin-left: -20rpx;
@@ -972,18 +973,20 @@
 	}
 
 	.tabs_wrapper-img {
-		width: 70rpx;
-		height: 70rpx;
+		width: 40rpx;
+		height: 60rpx;
 		position: absolute;
 		z-index: 888;
+		
 		background-color: #fff;
-		right: 0;
+		right: 0rpx;
 		top: 0;
 
 		image {
 			width: 40rpx;
 			height: 40rpx;
 			margin-top: 10rpx;
+			
 		}
 	}
 
diff --git a/pages/supply_chains/supply_chains.vue b/pages/supply_chains/supply_chains.vue
index 62c12e2..9f4d616 100644
--- a/pages/supply_chains/supply_chains.vue
+++ b/pages/supply_chains/supply_chains.vue
@@ -308,7 +308,7 @@
 				this.backColor = 0.5
 				this.isFshow = true
 			} else if (scrollTop > 100) {
-				this.backColor = 0.5
+				this.backColor = 1
 				this.isFshow = true