From 575ba131ae090165ac7f699f08cd772277412efd Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Tue, 5 Sep 2023 11:29:41 +0800
Subject: [PATCH 1/7] =?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

---
 config/app.js         | 4 ++--
 pages/index/index.vue | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/config/app.js b/config/app.js
index adddc06..29070a6 100644
--- a/config/app.js
+++ b/config/app.js
@@ -9,8 +9,8 @@ let httpApiThree
 // 网络接口修改此字符 小程序域名要求https
 // let httpApi = 'http://192.168.31.110:8324' // 测试
 if (process.env.NODE_ENV === "development") {
-	// httpApi = 'https://shop.lihaink.cn' // 生产
-	httpApi = "https://crmeb-test.shop.lihaink.cn"
+	httpApi = 'https://shop.lihaink.cn' // 生产
+	// httpApi = "https://crmeb-test.shop.lihaink.cn"
 	// httpApi = "http://192.168.0.222"
 	// httpApi = "http://192.168.0.108:8325"
 	// httpApi = 'http://192.168.0.108:8325'
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 9b76b2d..f52da0d 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -160,13 +160,18 @@
 
 		onLoad() {
 
+
+
 			this.getCateList()
 			this.getArticle()
 			this.getGoods()
 			
 			this.Area()
-			this.setPermissions()
+			//this.setPermissions()
 
+			
+
+		
 			// this.openTongZhi()
 			uni.$on('connectstatusChange', (connectstatus) => {
 				var connectstr = ''

From 22725b4c2eb3e5185606bf726c272cbb745a6081 Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Tue, 5 Sep 2023 11:30:45 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=A7=86=E9=A2=91?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/short_video/appSwiper/index.nvue  | 11 +++++--
 pages/short_video/nvueSwiper/index.nvue | 41 +++++++++++++++++++------
 2 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/pages/short_video/appSwiper/index.nvue b/pages/short_video/appSwiper/index.nvue
index 994a540..802388f 100644
--- a/pages/short_video/appSwiper/index.nvue
+++ b/pages/short_video/appSwiper/index.nvue
@@ -704,8 +704,13 @@
 				// 					});
 				// 				})'
 				// that.isUser ?
-				videoList().then(res=>{
-						that.getVideoData(res.data.list);
+				videoList({
+							page: that.page,
+							limit: that.limit,
+							id:this.videoID
+						
+						}).then(res=>{
+				   that.getVideoData(res.data.list);
 				})
 				
 				
@@ -1325,7 +1330,7 @@
 
 	.userInfo {
 		position: absolute;
-		bottom: 120px;
+		bottom: 400rpx;
 		right: 10px;
 		display: flex;
 		align-items: center;
diff --git a/pages/short_video/nvueSwiper/index.nvue b/pages/short_video/nvueSwiper/index.nvue
index 681e11a..7103afe 100644
--- a/pages/short_video/nvueSwiper/index.nvue
+++ b/pages/short_video/nvueSwiper/index.nvue
@@ -424,6 +424,7 @@
 				communityId: '',
 				Listcount: '',
 				loadMore: true,
+				videoshow:true
 			}
 		},
 		watch: {
@@ -741,9 +742,11 @@
 				}
 			},
 			get() {
+					
 				let that = this
+			
 				// 1.这里引入后端请求数据
-				    if(this.videoID){
+				    if(that.videoshow){
 						deoList(this.videoID).then(res => {
 							that.videoData([res.data])
 							if (res.data.list.length < that.limit) {
@@ -756,13 +759,32 @@
 								duration: 2000
 							});
 						})
-						this.videoID=''
+						this.videoshow=false
 					}else{
-						videoList().then(res=>{
-						  that.videoData(res.data.list);
-						})
-					}
-					
+						// videoList().then(res=>{
+						//   that.videoData(res.data.list);
+						// })
+							// console.log(that.userUid,that.videoID)
+						videoList({
+							page: that.page,
+							limit: that.limit,
+							id:this.videoID
+							// is_star: that.isSatrt,
+							// community_id: that.videoID
+						}).then(res => {
+							that.videoData(res.data.list)
+							if (res.data.list.length < that.limit) {
+								this.loadMore = false;
+							}
+						}).catch(err => {
+							return uni.showToast({
+								title: err,
+								icon: 'none',
+								duration: 2000
+							});
+						})	
+							}
+							
 				// that.isUser ?
 				// 	myVideoList(that.userUid, {
 				// 		page: that.page,
@@ -780,7 +802,8 @@
 				// 			icon: 'none',
 				// 			duration: 2000
 				// 		});
-				// 	}) :
+				// 	})
+				 //:
 				// 	graphicLstApi({
 				// 		page: that.page,
 				// 		limit: that.limit,
@@ -1412,7 +1435,7 @@
 
 	.userInfo {
 		position: absolute;
-		bottom: 60rpx;
+		bottom: 420rpx;
 		right: 20rpx;
 		flex-direction: column;
 		text-align: center;

From 8ac478412906a6d635e965abbab2110e19ea7563 Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Tue, 5 Sep 2023 11:48:08 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/gather/gather.vue | 33 +++++++++++++++++----------------
 pages/index/index.vue   |  9 ++++++---
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue
index b3b268d..d750591 100644
--- a/pages/gather/gather.vue
+++ b/pages/gather/gather.vue
@@ -31,7 +31,7 @@
       :show="jurisdiction"
       mode="permission"
       :text="emptyText"
-      icon="/static/empty/permission.png"
+      icon="http://cdn.uviewui.com/uview/empty/permission.png"
     ></u-empty>
     <view class="business com special_work" v-if="jurisdiction == false">
       <view class="title project">
@@ -101,9 +101,12 @@
       </view>
     </view>
 
-    <!-- <view class="" v-if="jurisdiction == false && isShow == false">
+    <view class="" v-if="jurisdiction == false && isShow == false">
       <emptyPage title="暂无信息"></emptyPage>
-    </view> -->
+    </view>
+	<u-picker :defaultIndex="[0,0]" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm"
+		@cancel="showPicker = false" @change="changeHandler" keyName="name"></u-picker>
+	
   </view>
 </template>
 
@@ -139,9 +142,7 @@ import {
 import {
   getDiy
 } from '@/api/api.js';
-// #ifdef APP-PLUS
 import uniMP from '@/utils/uniMP.js';
-// #endif
 
 export default {
   components: {
@@ -183,8 +184,8 @@ export default {
       ],
       nowMenuList: [],
       street: '',
-      showPicker: false,
-      columnData: [],
+    showPicker: false,
+    columnData: [],
       bgColor: '',
       isFshow: false,
       backColor: 'rgba(252, 252, 252, 0)'
@@ -337,7 +338,7 @@ export default {
       uni.setStorageSync('gatherNowMenuList', JSON.stringify(this.nowMenuList));
     },
     getUniMp (appid) {
-      console.log('点击小程序');
+      console.log('点击供销平台');
       // #ifdef APP-PLUS
       uniMP.loadMP(appid);
       return;
@@ -364,14 +365,14 @@ export default {
       }
     },
 
-    Area () {
-      getArea({
-        city_code: 510500
-      }).then(res => {
-        this.$refs.uPicker.setColumnValues(0, res.data);
-        this.Street(res.data[0]['code']);
-      });
-    },
+ Area() {
+ 	getArea({
+ 		city_code: 510500
+ 	}).then(res => {
+ 		this.$refs.uPicker.setColumnValues(0, res.data);
+ 		this.Street(res.data[0]['code']);
+ 	});
+ },
     Street (code) {
       getStreet({
         area_code: code
diff --git a/pages/index/index.vue b/pages/index/index.vue
index f52da0d..0de3ecd 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -163,9 +163,8 @@
 
 
 			this.getCateList()
-			this.getArticle()
+			// this.getArticle()
 			this.getGoods()
-			
 			this.Area()
 			//this.setPermissions()
 
@@ -229,7 +228,10 @@
 
 		},
 		// #endif
-
+	beforeDestroy () {
+		  // 销毁监听事件
+		  this.$bus.$off('value-updated')
+		},
 		methods: {
 
 			scrolling() {
@@ -725,6 +727,7 @@
 
 	/deep/.u-tabs__wrapper__nav__line {
 		width: 46rpx;
+		margin-left: -2rpx;
 
 
 	}

From 91e751adcd5a649bca26d50d5a672250b6d75aeb Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Tue, 5 Sep 2023 13:50:42 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.vue                   |  54 ++++++----
 pages/short_video/appSwiper/index.nvue  |   2 +-
 pages/short_video/nvueSwiper/index.nvue | 127 +++++++++++++-----------
 3 files changed, 101 insertions(+), 82 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index 0de3ecd..1ce2725 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -5,7 +5,8 @@
 				<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 :class="['iconfont','icon-weizhi',isFshow?'sitebox':'']"
+							style="color:#000;margin-left: 20rpx;">
 						</view>
 						<view class="town_name" style="color:#000;">{{street}}</view>
 					</view>
@@ -22,8 +23,8 @@
 			</view>
 
 
-			<zbpSwiper ref='list' :isSelectPlace="true" :town='street' :show='show' :location_Arr="locationArr" @kkchange='kkchange'
-				@change='dchange'>
+			<zbpSwiper ref='list' :isSelectPlace="true" :town='street' :show='show' :location_Arr="locationArr"
+				@kkchange='kkchange' @change='dchange'>
 			</zbpSwiper>
 
 
@@ -168,9 +169,9 @@
 			this.Area()
 			//this.setPermissions()
 
-			
 
-		
+
+
 			// this.openTongZhi()
 			uni.$on('connectstatusChange', (connectstatus) => {
 				var connectstr = ''
@@ -184,7 +185,9 @@
 			})
 
 		},
-
+		onTabItemTap(e) {
+			console.log(e)
+		},
 		onReachBottom() {
 			if (this.status == 'nomore') return;
 			this.status = 'loading';
@@ -201,7 +204,7 @@
 			this.$bus.$on('value-updated', (newValue) => {
 				// 更新父组件的值 
 				this.street = newValue.split(',')[0]
-				
+
 			});
 		},
 		// #ifdef APP-PLUS
@@ -216,11 +219,11 @@
 				this.isFshow = false
 				this.show = true
 			} else if (20 < scrollTop && scrollTop <= 100) {
-						this.backColor = 'rgba(255, 255, 255, 0.5)'
+				this.backColor = 'rgba(255, 255, 255, 0.5)'
 				this.isFshow = true
 				this.show = false
 			} else if (scrollTop > 100) {
-		     this.backColor = 'rgba(252, 252, 252, 1.0)'
+				this.backColor = 'rgba(252, 252, 252, 1.0)'
 				this.isFshow = true
 				this.show = false
 			}
@@ -228,9 +231,9 @@
 
 		},
 		// #endif
-	beforeDestroy () {
-		  // 销毁监听事件
-		  this.$bus.$off('value-updated')
+		beforeDestroy() {
+			// 销毁监听事件
+			this.$bus.$off('value-updated')
 		},
 		methods: {
 
@@ -267,7 +270,13 @@
 					this.backColor = 'rgba(252, 252, 252, 1.0)'
 					this.isFshow = true
 
-
+					uni.setTabBarItem({
+						index: 0,
+						text: '',
+				         id:'1',
+						iconPath: '/static/tabbar_icon/top.png',
+						selectedIconPath: '/static/tabbar_icon/top.png'
+					});
 				}
 
 
@@ -332,10 +341,10 @@
 			confirm(e) {
 
 				this.street = e.value[1].name
-		
-	         this.$nextTick(() => {
-				this.$bus.$emit('value-updated',e.value[1].name + ',' +e.value[1].code);
-				
+
+				this.$nextTick(() => {
+					this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code);
+
 				})
 				this.showPicker = false
 			},
@@ -412,7 +421,7 @@
 
 				graphicLstApi(this.where).then(res => {
 					this.cateGoods.push(...res.data.list)
-			
+
 					if (res.data.list.length < this.where.limit) this.status = 'nomore'
 
 					if (this.where.page == 1 && res.data.list.length <= 0) this.emptyShow = true
@@ -476,11 +485,12 @@
 							let town = res.data.address_reference.town.title
 							let street_id = res.data.address_reference.town.id
 							this.street = res.data.address_component.street
-							
+
 							this.$nextTick(() => {
-										this.$bus.$emit('value-updated',this.street + ',' +street_id);
-										
-										})
+								this.$bus.$emit('value-updated', this.street + ',' +
+									street_id);
+
+							})
 						}).catch(err => {
 							uni.showToast({
 								title: err,
diff --git a/pages/short_video/appSwiper/index.nvue b/pages/short_video/appSwiper/index.nvue
index 802388f..2c9e80f 100644
--- a/pages/short_video/appSwiper/index.nvue
+++ b/pages/short_video/appSwiper/index.nvue
@@ -320,7 +320,7 @@
 			<view class="sys-head" :style="{height:statusBarHeight}"></view>
 			<view class="tool-bar" @click='goBack()'>
 
-				<image class="icon-xiangzuo" src="../static/img/index/icon-back.png"></image>
+				<image class="icon-xiangzuo" src="@/static/image/icon-back.png"></image>
 			</view>
 		</view>
 	</view>
diff --git a/pages/short_video/nvueSwiper/index.nvue b/pages/short_video/nvueSwiper/index.nvue
index 7103afe..4dac07e 100644
--- a/pages/short_video/nvueSwiper/index.nvue
+++ b/pages/short_video/nvueSwiper/index.nvue
@@ -15,9 +15,14 @@
 		<!-- 头部导航 -->
 
 
-		<!-- <view v-if="!isUser" class="header" :style="{backgroundColor:'#Fff'}">
 
+		<view class="header" >
 			<view class="tool-bar">
+				<view class='xiangzuo' @tap='goBack'>
+					<image src="@/static/images/icon-back.png" mode="aspectFit"></image>
+				</view>
+			</view>
+			<!-- <view class="tool-bar">
 				<view class='iconfont icon-xiangzuo' @tap='goBack'></view>
 			</view>
 			<view class="items" @click.stop="navTap(2)">
@@ -31,11 +36,12 @@
 			</view>
 			<view class="items" @click.stop="navTap(4)">
 				<text class="tName" :class="currentNav==4?'on':''">社区</text>
-			</view>
-			
-		</view> -->
-		<swiper v-show="currentNav !== 3&&currentNav != 4" :style="'width: '+ windowWidth +'px; height: '+ windowHeight +'px;'"
-			:vertical="true" @animationfinish="animationfinish" @change="change" :current="k" :indicator-dots="false">
+			</view> -->
+
+		</view>
+		<swiper v-show="currentNav !== 3&&currentNav != 4"
+			:style="'width: '+ windowWidth +'px; height: '+ windowHeight +'px;'" :vertical="true"
+			@animationfinish="animationfinish" @change="change" :current="k" :indicator-dots="false">
 			<swiper-item v-for="(list,index) in dataList">
 				<view v-if="max > index">
 
@@ -249,7 +255,7 @@
 				</view>
 			</block>
 		</scroll-view>
-	
+
 		<!-- <view class="video-list" v-if="currentNav === 3"
       :style="'width: '+ windowWidth +'px; height: '+ windowHeight +'px;'">
       
@@ -317,7 +323,7 @@
 	} from '@/utils';
 	import comment from '@/components/comment.vue';
 	import mentioned from '@/components/mentioned.vue';
-	
+
 	import {
 		HTTP_REQUEST_URL
 	} from '@/config/app';
@@ -343,12 +349,12 @@
 			comment,
 			mentioned,
 			authorize,
-	
+
 		},
 		computed: configMap({
 			community_reply_status: 0
 		}, mapGetters(['isLogin', 'uid'])),
-		
+
 		data() {
 			return {
 				isTriggered: false,
@@ -424,7 +430,7 @@
 				communityId: '',
 				Listcount: '',
 				loadMore: true,
-				videoshow:true
+				videoshow: true
 			}
 		},
 		watch: {
@@ -742,49 +748,49 @@
 				}
 			},
 			get() {
-					
+
 				let that = this
-			
+
 				// 1.这里引入后端请求数据
-				    if(that.videoshow){
-						deoList(this.videoID).then(res => {
-							that.videoData([res.data])
-							if (res.data.list.length < that.limit) {
-								this.loadMore = false;
-							}
-						}).catch(err => {
-							return uni.showToast({
-								title: err,
-								icon: 'none',
-								duration: 2000
-							});
-						})
-						this.videoshow=false
-					}else{
-						// videoList().then(res=>{
-						//   that.videoData(res.data.list);
-						// })
-							// console.log(that.userUid,that.videoID)
-						videoList({
-							page: that.page,
-							limit: that.limit,
-							id:this.videoID
-							// is_star: that.isSatrt,
-							// community_id: that.videoID
-						}).then(res => {
-							that.videoData(res.data.list)
-							if (res.data.list.length < that.limit) {
-								this.loadMore = false;
-							}
-						}).catch(err => {
-							return uni.showToast({
-								title: err,
-								icon: 'none',
-								duration: 2000
-							});
-						})	
-							}
-							
+				if (that.videoshow) {
+					deoList(this.videoID).then(res => {
+						that.videoData([res.data])
+						if (res.data.list.length < that.limit) {
+							this.loadMore = false;
+						}
+					}).catch(err => {
+						return uni.showToast({
+							title: err,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+					this.videoshow = false
+				} else {
+					// videoList().then(res=>{
+					//   that.videoData(res.data.list);
+					// })
+					// console.log(that.userUid,that.videoID)
+					videoList({
+						page: that.page,
+						limit: that.limit,
+						id: this.videoID
+						// is_star: that.isSatrt,
+						// community_id: that.videoID
+					}).then(res => {
+						that.videoData(res.data.list)
+						if (res.data.list.length < that.limit) {
+							this.loadMore = false;
+						}
+					}).catch(err => {
+						return uni.showToast({
+							title: err,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+				}
+
 				// that.isUser ?
 				// 	myVideoList(that.userUid, {
 				// 		page: that.page,
@@ -803,7 +809,7 @@
 				// 			duration: 2000
 				// 		});
 				// 	})
-				 //:
+				//:
 				// 	graphicLstApi({
 				// 		page: that.page,
 				// 		limit: that.limit,
@@ -1329,12 +1335,15 @@
 			display: flex;
 			justify-content: center;
 
-			.icon-xiangzuo {
-				margin-right: 40rpx;
-				margin-left: 20rpx;
-				font-size: 30rpx;
-				color: #333;
-				margin-top: 60rpx;
+			.xiangzuo {
+				width: 23rpx;
+				height: 42rpx;
+            margin-right: 40rpx;
+            margin-left: 20rpx;
+				image {
+					width: 100%;
+					height: 100%;
+				}
 			}
 		}
 

From 45abe9c2f97553f16b27ed88a4ef5473a9387ba1 Mon Sep 17 00:00:00 2001
From: THK3121 <thk121969318@163.com>
Date: Tue, 5 Sep 2023 15:47:45 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                   |   18 +-
 pages/activity/combination_details/index.vue | 1969 ------------------
 pages/nongKe/food/index.vue                  | 1311 ++++++++++++
 pages/nongKe/specialty/index.vue             | 1444 +++++++++++--
 pages/nongKe/specialty/indexa.vue            |  324 +++
 pages/nongKe/supply_chain/supplier.vue       |   28 +-
 pages/nongKe/supply_chain/supplierA.vue      |   23 +-
 pages/nongKe/tourism/index.vue               | 1314 ++++++++++++
 pages/supply_chains/supply_chains.vue        | 1591 +++++++-------
 9 files changed, 5007 insertions(+), 3015 deletions(-)
 create mode 100644 pages/nongKe/food/index.vue
 create mode 100644 pages/nongKe/specialty/indexa.vue
 create mode 100644 pages/nongKe/tourism/index.vue

diff --git a/pages.json b/pages.json
index 1142d9f..090c868 100644
--- a/pages.json
+++ b/pages.json
@@ -216,7 +216,7 @@
 						"navigationStyle": "custom"
 					}
 
-				}, 
+				},
 				{
 					"path": "supply_chain/suppliers",
 					"style": {
@@ -278,6 +278,22 @@
 						"navigationStyle": "custom"
 					}
 
+				}, {
+					"path": "food/index",
+					"style": {
+						"navigationBarTitleText": "当地美食",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+
+				}, {
+					"path": "tourism/index",
+					"style": {
+						"navigationBarTitleText": "特色文旅",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+
 				}
 			]
 		},
diff --git a/pages/activity/combination_details/index.vue b/pages/activity/combination_details/index.vue
index b84ce84..e69de29 100644
--- a/pages/activity/combination_details/index.vue
+++ b/pages/activity/combination_details/index.vue
@@ -1,1969 +0,0 @@
-<template>
-	<view :style="viewColor">
-		<view class="product-con">
-			<view class="head-wrapper" :style="'top:'+statusBarHeight">
-				<view class="head-menu">
-					<view class='iconfont icon-xiangzuo' @click="returns"></view>
-					<view class="iconfont icon-shouye4" @click="goHome"></view>
-				</view>
-			</view>
-			<view>
-				<scroll-view :scroll-top="scrollTop" scroll-y='true' scroll-with-animation="true" :style='"height:"+height+"px;"'
-				 @scroll="scroll">
-					<view id="past0">
-						<productConSwiper class="skeleton-rect" :imgUrls="storeInfo.slider_image" :videoCoverImg="videoCoverImg" :videoline="storeInfo.video_link"></productConSwiper>
-						<view v-if="storeInfo.atmosphere_pic" :style="{ backgroundImage: `url(${storeInfo.atmosphere_pic})` }" class="nav acea-row row-between-wrapper">
-							<view class='money skeleton-rect'>
-								￥<text class='num'>{{combinationInfo.price}}</text><text class="y-money">￥{{storeInfo.price}}</text>
-							</view>
-						</view>
-						<view class='wrapper'>
-							<view :class="{ atmosphere: storeInfo.atmosphere_pic }" class='share acea-row row-between row-bottom' style="padding: 0;margin: 0;">
-								<view v-if="storeInfo.atmosphere_pic" class='introduce skeleton-rect'>
-									<text v-if="(storeInfo.merchant && storeInfo.merchant.type_name)" class="font-bg-red">{{storeInfo.merchant.type_name}}</text>
-									<text v-else-if="(storeInfo.merchant && storeInfo.merchant.is_trader)" class="font-bg-red">自营</text>
-									{{storeInfo.store_name}}
-								</view>
-								<view v-else class='money skeleton-rect' style="min-width: 10rpx;">
-									<text class="p-color">￥<text class='num'>{{combinationInfo.price}}</text></text>
-									<text class="font-gray orig_price">￥<text class='num' style="font-size: 28rpx;">{{storeInfo.price}}</text></text>
-								</view>
-								<view @click="listenerActionSheet" class="fenxiang_btn">
-									<view class='iconfont icon-fenxiang'></view>
-									分享
-								</view>
-							</view>
-							<view v-if="!storeInfo.atmosphere_pic" class='introduce skeleton-rect'>
-								<text v-if="(storeInfo.merchant && storeInfo.merchant.type_name)" class="font-bg-red">{{storeInfo.merchant.type_name}}</text>
-								<text v-else-if="(storeInfo.merchant && storeInfo.merchant.is_trader)" class="font-bg-red">自营</text>
-								{{storeInfo.store_name}}
-							</view>
-							<view class='label acea-row row-between-wrapper'>
-								<view class="skeleton-rect">类型:{{combinationInfo.buying_count_num ? combinationInfo.buying_count_num : 0}}人团</view>
-								<view class="skeleton-rect">库存:{{combinationInfo.stock ? combinationInfo.stock : 0}}</view>
-								<view class="skeleton-rect">已拼:{{combinationInfo.sales ? combinationInfo.sales : 0}}{{storeInfo.unit_name ? storeInfo.unit_name : ''}}</view>
-							</view>
-						</view>
-						<view class="combination_wrapper">
-							<view class='notice acea-row row-middle' v-if="itemNew.length">
-								<view class='num t-color'>
-									<text class='iconfont icon-laba'></text>
-									已拼{{combinationInfo.sales ? combinationInfo.sales : 0}}{{storeInfo.unit_name ? storeInfo.unit_name : ''}}<text
-									 class='line'>|</text>
-								</view>
-								<view class='swiper'>
-									<swiper :indicator-dots="indicatorDots" :autoplay="autoplay" interval="2500" duration="500" vertical="true"
-									 circular="true">
-										<block v-for="(item,index) in itemNew" :key='index'>
-											<swiper-item>
-												<view class='line1'>{{item.nickname ? item.nickname : ''}}拼团成功</view>
-											</swiper-item>
-										</block>
-									</swiper>
-								</view>
-							</view>
-							<view class='assemble' v-if="pink.length" :style="itemNew.length ? '' : 'margin-top: 20rpx;'">
-								<view class='item acea-row row-between-wrapper skeleton-rect' v-for='(item,index) in pink' :key='index' v-if="index < AllIndex && pink.length>0">
-									<view class='pictxt acea-row row-between-wrapper'>
-										<view class='pictrue'>
-											<image :src='item.initiator.avatar ? item.initiator.avatar : "/static/images/f.png"'></image>
-										</view>
-										<view class='text line1'>{{ item.initiator.nickname ? item.initiator.nickname : ""}}</view>
-									</view>
-									<view class='right acea-row row-middle'>
-										<view>
-											<view class='lack'>还差<text class='t-color'>{{item.buying_count_num - item.yet_buying_num}}</text>人成团</view>
-											<view class='time'>
-												剩余
-												<count-down :justifyLeft="justifyLeft" :is-day="false" :tip-text="' '" :day-text="' '" :hour-text="':'"
-												 :minute-text="':'" :second-text="' '" :datatime="item.end_time"></count-down>
-											</view>
-										</view>
-										<navigator hover-class='none' :url="'/pages/activity/combination_status/index?id='+item.group_buying_id" class='spellBnt'>
-											去拼单
-											<text class='iconfont icon-jiantou'></text>
-										</navigator>
-									</view>
-								</view>
-								<template v-if="pink.length">
-									<view class='more' @tap='showAll' v-if="pink.length > AllIndex">查看更多<text class='iconfont icon-xiangxia'></text></view>
-									<view class='more' @tap='hideAll' v-else-if="pink.length === AllIndex && pink.length !== AllIndexDefault">收起<text
-										 class='iconfont icon-xiangshang'></text></view>
-								</template>
-							</view>
-							<view class='playWay skeleton-rect'>
-								<view class='title acea-row row-between-wrapper'>
-									<view>拼团玩法</view>
-								</view>
-								<view class='way acea-row row-middle'>
-									<view class='item'>
-										<text class='num'>①</text>
-										<text class="way_text">开团/参团</text>
-									</view>
-									<view class='iconfont icon-arrow'></view>
-									<view class='item'>
-										<text class='num'>②</text>
-										<text class="way_text">邀请好友</text>
-									</view>
-									<view class='iconfont icon-arrow'></view>
-									<view class='item'>
-										<view>
-											<text class='num'>③</text>
-											<text class="way_text">满员发货</text>
-										</view>
-										<!-- <view class='tip'>不满自动退款</view> -->
-									</view>
-								</view>
-							</view>
-						</view>
-						<view class='attribute acea-row row-between-wrapper skeleton-rect' @click="selecAttr">
-							<view class='acea-row row-between-wrapper'>
-								<text class="atterName">{{attrTxt}}：</text>
-								<text class='atterTxt'>{{attrValue}}</text>
-							</view>
-							<view class='iconfont icon-jiantou'></view>
-						</view>
-						<!--运费-->
-						<view v-if="shipping || shippingValue" class='attribute acea-row row-between-wrapper' @click="showShip">
-							<view class="acea-row row-between-wrapper">运费：
-								<text class='atterTxt'>{{shippingValue}}</text>
-							</view>
-							<view class='iconfont icon-jiantou'></view>
-						</view>
-						<!--保障-->
-						<view v-if="guarantee.length" class='attribute acea-row row-between-wrapper' @click="showGuaranee">
-							<view class="acea-row row-between-wrapper">保障：
-								<view class="guaranteeAttr">
-									<text class='atterTxt1' :class="item.guarantee_name ? 'hasAttr' : ''" v-for="(item,index) in guarantee">
-										{{item.guarantee_name ? item.guarantee_name : ''}}
-									</text>
-								</view>
-							</view>
-							<view class='iconfont icon-jiantou'></view>
-						</view>
-						<!--商品参数-->
-						<view v-if="specsInfo.params && specsInfo.params.length>0" class="attribute acea-row row-between-wrapper" @click="seeSpecs">
-						  <view class="acea-row row-middle">
-						    参数：
-						    <view class="list line1">
-						      <text class="item params" v-for="(item,index) in specsInfo.params" :key="index"
-						        v-if="index<2">{{item.name}}</text>
-						      <text>...</text>
-						    </view>
-						  </view>
-						  <view class="iconfont icon-jiantou"></view>
-						</view>
-					</view>
-					<view class='userEvaluation' id="past1" v-if="replyCount && replyCount>0">
-						<view class='title acea-row row-between-wrapper'>
-							<view>用户评价({{replyCount}})</view>
-							<navigator class='praise' hover-class='none' :url='"/pages/users/goods_comment_list/index?product_id="+storeInfo.product_id'>
-								<text class='t-color'>{{replyChance}}</text>好评率
-								<text class='iconfont icon-jiantou'></text>
-							</navigator>
-						</view>
-						<block v-if="replyCount">
-							<userEvaluation :reply="reply"></userEvaluation>
-						</block>
-					</view>
-					<!-- 种草秀 -->
-					<view class='userPlant' v-if="storeInfo.community && storeInfo.community.length>0">
-						<view class='title acea-row row-between-wrapper'>
-							<view>种草秀 </view>
-							<navigator class='praise' hover-class='none' :url="'/pages/plantGrass/plant_show/index?spu_id='+storeInfo.spu_id">
-								查看全部
-								<text class='iconfont icon-jiantou'></text>
-							</navigator>
-						</view>
-						<view class="imgList acea-row">
-							<navigator class="pictrue" v-for="(item, index) in storeInfo.community" :key="index" v-if="index<=2"
-							 hover-class='none' :url="'/pages/plantGrass/plant_detail/index?id='+item.community_id">
-								<image :src="item.image[0]" class="image"></image>
-							</navigator>
-						</view>
-					</view>
-					<!-- 商铺信息 -->
-					<view v-if="hide_mer_status == 0 && storeInfo.merchant" class="store-wrapper">
-						<view class="store-hd skeleton-rect">
-							<view class="store-info">
-								<view class="logo">
-									<image :src="storeInfo.merchant.mer_avatar" mode=""></image>
-								</view>
-								<view class="info">
-									<view class="name">{{storeInfo.merchant.mer_name}}
-									<text v-if="(storeInfo.merchant && storeInfo.merchant.type_name)" class="font-bg-red ml8">{{storeInfo.merchant.type_name}}</text>
-									<text v-else-if="(storeInfo.merchant && storeInfo.merchant.is_trader)" class="font-bg-red ml8">自营</text>
-									</view>
-									<view class="txt">
-									{{storeInfo.merchant.care_count < 10000 ? storeInfo.merchant.care_count : (storeInfo.merchant.care_count/10000).toFixed(2)+'万'}}人关注
-									</view>
-								</view>
-								<navigator :url="'/pages/store/home/index?id='+storeInfo.merchant.mer_id" class="link" hover-class="none">进店</navigator>
-							</view>
-							<view class="score-wrapper">
-								<view class="item">
-									商品描述<text>{{storeInfo.merchant.product_score}}</text>
-								</view>
-								<view class="item">
-									卖家服务<text>{{storeInfo.merchant.service_score}}</text>
-								</view>
-								<view class="item">
-									物流服务<text>{{storeInfo.merchant.postage_score}}</text>
-								</view>
-							</view>
-						</view>
-						<view v-if="storeInfo.merchant.recommend && storeInfo.merchant.recommend.length > 0" class="con-box">
-							<view class="title">店铺推荐</view>
-							<scroll-view scroll-x="true" style="white-space: nowrap; display: flex" show-scrollbar="false">
-								<view class="img-box">
-									<view class="img-item" v-for="(item,index) in storeInfo.merchant.recommend" :key="index" @click="goProDetail(item)">
-										<image :src="item.image" mode=""></image>
-										<view class="txt">
-											<view class="title line1">{{item.store_name}}</view>
-											<view class="price">
-												<text>￥</text>{{item.price}}
-											</view>
-										</view>
-									</view>
-								</view>
-							</scroll-view>
-						</view>
-					</view>
-					<view class='product-intro' id="past3">
-						<view class='title'>产品介绍</view>
-						<view class='conter' v-if="description">
-							<jyf-parser :domain="domain" :html="description.content" ref="article" :tag-style="tagStyle"></jyf-parser>
-						</view>
-						<!-- 价格说明 -->
-						<view v-if="priceRule.content" class="price-info">
-							<view class="price-title">价格说明</view>
-							<!-- #ifndef APP-PLUS -->
-							<jyf-parser :domain='domain' :html="priceRule.content.replace(/<br\/>/ig, '')" ref="article" :tag-style="tagStyle"></jyf-parser>
-							<!-- #endif -->
-							<!-- #ifdef APP-PLUS -->
-							<view class="description" v-html="priceRule.content.replace(/<br\/>/ig, '')"></view>
-							<!-- #endif -->
-						</view>
-					</view>
-					<view style='height:120rpx;'></view>
-				</scroll-view>
-			</view>
-			<view class='footer_count'>
-				<view class="acea-row row-between-wrapper footer">
-					<view v-if="storeInfo.merchant && storeInfo.merchant.services_type == 1" class="item skeleton-rect" @click="call">
-						<view class="iconfont icon-kefu"></view>
-						<view>客服</view>
-					</view>
-					<view v-else @click="goCustomer" class="item  skeleton-rect">
-						<view class="iconfont icon-kefu"></view>
-						<view>客服</view>
-					</view>
-					<view @click="setCollect" class='item  skeleton-rect'>
-						<view class='iconfont icon-shoucang1' v-if="storeInfo.isRelation"></view>
-						<view class='iconfont icon-shoucang' v-else></view>
-						<view>收藏</view>
-					</view>
-					<view class='bnt acea-row'>
-						<form @submit="joinCart" report-submit='true'>
-							<button class='joinCart bnts skeleton-rect' @tap="openAlone">单独购买</button>
-						</form>
-						<form @submit="goBuy" report-submit='true' v-if="attr.productSelect ">
-							<button v-if="attr.productSelect.stock == 0" class='buy bnts skeleton-rect' form-type="submit" disabled>已售罄</button>
-							<button v-else class='buy bnts skeleton-rect' form-type="submit">立即开团</button>
-						</form>
-					</view>
-				</view>
-			</view>
-			<block v-if="sharePacket.max&&sharePacket.min">
-				<shareRedPackets :sharePacket="sharePacket" @listenerActionSheet="listenerActionSheet" @closeChange="closeChange"
-				 :showAnimate="showAnimate" @boxStatus="boxStatus"></shareRedPackets>
-			</block>
-			<!--商品参数-->
-			<specs :specsInfo="specsInfo" @myevent="mySpecs"></specs>
-			<!-- 组件 -->
-			<productWindow :attr="attr" :isShow='1' :iSplus='1' :image="storeInfo.image" @myevent="onMyEvent" @ChangeAttr="ChangeAttr"
-			 @ChangeCartNum="ChangeCartNum" @attrVal="attrVal" @iptCartNum="iptCartNum" id='product-window'></productWindow>
-			<!-- 分享按钮 -->
-			<view class="generate-posters acea-row row-middle" :class="posters ? 'on' : ''">
-				<!-- #ifndef MP -->
-				<button class="item" :class="weixinStatus ? 'item3' : ''" hover-class='none' v-if="weixinStatus === true" @click="H5ShareBox = true">
-					<view class="iconfont icon-weixin3"></view>
-					<view class="">发送给朋友</view>
-				</button>
-				<!-- #endif -->
-				<!-- #ifdef MP -->
-				<button class="item" :class="weixinStatus ? 'item3' : ''" open-type="share" hover-class='none' @click="goFriend">
-					<view class="iconfont icon-weixin3"></view>
-					<view class="">发送给朋友</view>
-				</button>
-				<!-- #endif -->
-				<button class="item" :class="weixinStatus ? 'item3' : ''" hover-class='none' @click="goPoster">
-					<view class="iconfont icon-haibao"></view>
-					<view class="">生成海报</view>
-				</button>
-				<button class="item" :class="weixinStatus ? 'item3' : ''" hover-class='none' @click="copyPwd">
-					<view class="iconfont icon-fuzhikouling1"></view>
-					<view>生成口令</view>
-				</button>
-			</view>
-			<view class="mask" v-if="posters" @click="listenerActionClose"></view>
-			<!--口令复制结果-->
-			<copyPassword :isCopy='isCopy' :copyUrl='copyUrl' @close="closeCopy"></copyPassword>
-			<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
-			<!-- 海报展示 -->
-			<view class='poster-pop' v-if="posterImageStatus">
-				<image src='../../../static/images/poster-close.png' class='close' @click="posterImageClose"></image>
-				<image :src='posterImage'></image>
-				<!-- #ifndef H5  -->
-				<view class='save-poster' @click="savePosterPath">保存到手机</view>
-				<!-- #endif -->
-				<!-- #ifdef H5 -->
-				<view class="keep">长按图片可以保存到手机</view>
-				<!-- #endif -->
-			</view>
-			<view class='mask' v-if="posterImageStatus"></view>
-			<canvas class="canvas" canvas-id='myCanvas' v-if="canvasStatus"></canvas>
-			<!-- 发送给朋友图片 -->
-			<view class="share-box" v-if="H5ShareBox">
-				<image src="/static/images/share-info.png" @click="H5ShareBox = false"></image>
-			</view>
-			<guaranteeTemplate ref="guartemplate" :guarantee='guarantee' :shipping='shipping'></guaranteeTemplate>
-			<!-- #ifndef H5 -->
-			<passwordPopup></passwordPopup>
-			<!-- #endif -->
-		</view>
-	</view>
-</template>
-<script>
-	// +----------------------------------------------------------------------
-	// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
-	// +----------------------------------------------------------------------
-	// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
-	// +----------------------------------------------------------------------
-	// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
-	// +----------------------------------------------------------------------
-	// | Author: CRMEB Team <admin@crmeb.com>
-	// +----------------------------------------------------------------------
-	var statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
-	import {
-		getProductCode,
-		collectAdd,
-		collectDel,
-		postCartAdd,
-		copyPasswordApi, priceRuleApi
-	} from '@/api/store.js';
-	import { getCombinationDetail } from '@/api/activity.js';
-	import { getUserInfo, imgToBase } from '@/api/user.js';
-	import { getCartCounts } from '@/api/order.js';
-	import { mapGetters } from "vuex";
-	import { imageBase64 } from "@/api/public";
-	import productConSwiper from '@/components/productConSwiper';
-	import productWindow from '@/components/productWindow';
-	import specs from '@/components/specs/index.vue';
-	import copyPassword from '@/components/copyPassword';
-	import userEvaluation from '@/components/userEvaluation';
-	import shareRedPackets from '@/components/shareRedPackets';
-	import { HTTP_REQUEST_UR } from '@/config/app';
-	import home from '@/components/home';
-	import { silenceBindingSpread, configMap } from "@/utils";
-	import parser from "@/components/jyf-parser/jyf-parser";
-	import { HTTP_REQUEST_URL } from '@/config/app';
-	import authorize from '@/components/Authorize';
-	// #ifndef H5
-	import passwordPopup from '@/components/passwordPopup';
-	// #endif
-	import shareScence from "@/libs/spread";
-	let app = getApp();
-	import history from "@/mixins/history";
-	import countDown from '@/components/countDown/index.vue';
-	import guaranteeTemplate from '@/components/freightGuarantee';
-	export default {
-		components: {
-			// #ifndef H5
-			passwordPopup,
-			// #endif
-			productConSwiper,
-			productWindow,
-			specs,
-			userEvaluation,
-			shareRedPackets,
-			home,
-			countDown,
-			guaranteeTemplate,
-			copyPassword,
-			"jyf-parser": parser,
-			authorize,
-		},
-		mixins: [history],
-		data() {
-			let that = this;
-			return {
-				isNodes: 0, //控制什么时候开始抓取元素节点,只要数值改变就重新抓取
-				statusBarHeight: statusBarHeight, //系统导航条高度
-				attrTxt: '请选择', //属性页面提示
-				attrValue: '', //已选属性
-				animated: false, //购物车动画
-				id: 0, //商品id
-				replyCount: 0, //总评论数量
-				reply: [], //评论列表
-				storeInfo: {}, //商品详情
-				combinationInfo: {}, //预售详情
-				productValue: [], //系统属性
-				cart_num: 1, //购买数量
-				isAuto: false, //没有授权的不会自动授权
-				isShowAuth: false, //是否隐藏授权
-				isOpen: false, //是否打开属性组件
-				actionSheetHidden: true,
-				posterImageStatus: false,
-				storeImage: '', //海报产品图
-				PromotionCode: '', //二维码图片
-				canvasStatus: false, //海报绘图标签
-				posterImage: '', //海报路径
-				posterbackgd: '/static/images/posterbackgd.png',
-				sharePacket: {
-					isState: true, //默认不显示
-				}, //分销商详细
-				circular: false,
-				autoplay: true,
-				interval: 3000,
-				duration: 500,
-				clientHeight: "",
-				itemNew: [],
-				indicatorDots: false,
-				systemStore: {}, //门店信息
-				replyChance: 0,
-				CartCount: 0,
-				isDown: true,
-				posters: false,
-				weixinStatus: false,
-				attr: {
-					cartAttr: false,
-					productAttr: [],
-					productSelect: {}
-				},
-				description: '',
-				priceRule: "",
-				navActive: 0,
-				H5ShareBox: false, //公众号分享图片
-				retunTop: true, //顶部返回
-				navH: "",
-				navList: [],
-				opacity: 0,
-				scrollY: 0,
-				topArr: [],
-				toView: '',
-				height: 0,
-				heightArr: [],
-				lock: false,
-				scrollTop: 0,
-				tagStyle: {
-					img: 'width:100%;display:block;'
-				},
-				// 动画状态
-				showAnimate: true,
-				domain: HTTP_REQUEST_URL,
-				minNum: 0,
-				pink_ok_sum: 0,
-				pink: [],
-				AllIndexDefault: 0,
-				AllIndex: 2,
-				maxAllIndex: 0,
-				currSpid: '',
-				codeImg: "",
-				justifyLeft: "display: inline;",
-				videoCoverImg: "",
-				shipping: "",
-				guarantee: [],
-				guaranteeValue: "",
-				shippingValue: "",
-				isCopy: false,
-				copyUrl: '',
-				services_type: "",
-				specsInfo: {
-				  show: false,
-				  params: []
-				},
-			};
-		},
-		computed: configMap(['hide_mer_status','share_pic','site_name'],mapGetters(['isLogin','uid','viewColor'])),
-		onLoad(options) {
-			let that = this
-			if (options.spid) {
-				app.globalData.spid = options.spid;
-				that.currSpid = options.spid
-			}
-			var pages = getCurrentPages();
-			if (pages.length <= 1) {
-				that.retunTop = false
-			}
-			// #ifdef MP
-			this.navH = app.globalData.navHeight;
-			// #endif
-			// #ifndef MP
-			this.navH = 96;
-			// #endif
-			if (options.id) {
-				this.id = options.id
-			}
-			uni.getSystemInfo({
-				success: function(res) {
-					that.height = res.windowHeight
-				},
-			});
-			//扫码携带参数处理
-			// #ifdef MP
-			if (options.scene) {
-				let value = this.$util.getUrlParams(decodeURIComponent(options.scene));
-				if (value.id) options.id = value.id;
-				//记录推广人uid
-				if (value.spid) {
-					app.globalData.spid = value.spid;
-					that.currSpid = value.spid
-				}
-			}
-			if (!options.id && !options.scene) {
-				return this.$util.Tips({
-					title: '缺少参数无法查看商品'
-				}, {
-					tab: 3,
-					url: 1
-				});
-			} else {
-				this.id = options.id
-			}
-			//记录推广人uid
-			if (options.spid) app.globalData.spid = options.spid;
-			// #endif
-			shareScence(that.currSpid, that.isLogin)
-			that.getGoodsDetails();
-			if (this.isLogin) {
-				this.downloadFilePromotionCode();
-				//#ifdef H5
-				silenceBindingSpread();
-				//#endif
-				this.getHistory()
-			}
-		},
-		onReady() {
-			this.isNodes++;
-		},
-		onShow() {
-
-		},
-		/**
-		 * 用户点击右上角分享
-		 */
-		// #ifdef MP
-		onShareAppMessage: function() {
-			let that = this;
-			return {
-				title: that.storeInfo.store_name || '',
-				imageUrl: that.storeInfo.image || '',
-				path: '/pages/activity/combination_details/index?id=' + that.id + '&spid=' + that.uid,
-			}
-		},
-		onShareTimeline: function() {
-			let that = this;
-			return {
-				title: that.storeInfo.store_name || '',
-				query: {
-					id: that.id,
-					spid: that.uid
-				},
-				imageUrl: that.storeInfo.image || ''
-			}
-		},
-		// #endif
-		methods: {
-			call: function(){
-				uni.makePhoneCall({
-					// 手机号
-				    phoneNumber: this.storeInfo.merchant.service_phone,
-					// 成功回调
-					success: (res) => {
-						// console.log('调用成功!')
-					},
-					// 失败回调
-					fail: (res) => {
-						// console.log('调用失败!')
-					}
-				});
-			},
-			goCustomer(){
-				let that = this;
-				if (that.isLogin === false) {
-					this.isAuto = true;
-					this.isShowAuth = true
-				} else {
-					uni.navigateTo({
-						url: `/pages/chat/customer_list/chat?mer_id=${that.storeInfo.mer_id}&uid=${that.uid}&productId=${that.storeInfo.product_id}&combinationId=${that.id}`
-					});
-				}
-			},
-			showAll: function() {
-				this.AllIndexDefault = this.AllIndex;
-				this.AllIndex = this.pink.length;
-			},
-			hideAll: function() {
-				this.AllIndex = this.AllIndexDefault;
-			},
-			seeSpecs() {
-			  this.specsInfo.show = true;
-			},
-			mySpecs() {
-			  this.$set(this.specsInfo, 'show', false);
-			},
-			goProDetail(item) {
-				// console.log(item, 'goProDetail')
-				uni.redirectTo({
-					url: '/pages/goods_details/index?id=' + item.product_id
-				})
-			},
-			boxStatus(data) {
-				this.showAnimate = data
-			},
-			closeChange: function() {
-				this.$set(this.sharePacket, 'isState', true);
-			},
-			/**查看运费说明*/
-			showShip: function() {
-				this.$refs.guartemplate.showShippingTel();
-			},
-			/**查看服务保障*/
-			showGuaranee: function() {
-				this.$refs.guartemplate.showGuaranteeTel();
-			},
-			/*获取价格说明*/
-			getPricrRule() {
-				priceRuleApi(this.storeInfo.cate_id).then(res => {
-					this.priceRule = res.data
-				}).catch(err => {});
-			},
-			/**
-			 * 购物车手动填写
-			 *
-			 */
-			iptCartNum: function(e) {
-				let num = parseInt(e)
-				let stock = this.combinationInfo.self_count ? parseInt(this.combinationInfo.self_count) : 999999999;
-				if (num > stock) {
-					this.$nextTick(res => {
-						this.$set(this.attr.productSelect, 'cart_num', stock);
-					})
-				} else {
-					if (num <= 0) {
-						this.$nextTick(res => {
-							this.$set(this.attr.productSelect, 'cart_num', stock);
-						})
-					} else {
-						this.$nextTick(res => {
-							this.$set(this.attr.productSelect, 'cart_num', num);
-						})
-					}
-				}
-			},
-			// 后退
-			returns: function() {
-				uni.navigateBack()
-			},
-			// 首页
-			goHome() {
-				uni.switchTab({
-					url: '/pages/index/index'
-				});
-			},
-			tap: function(index) {
-				var id = "past" + index;
-				var index = index;
-				var that = this;
-				this.$set(this, 'toView', id);
-				this.$set(this, 'navActive', index);
-				this.$set(this, 'lock', true);
-				this.$set(this, 'scrollTop', index > 0 ? that.topArr[index] - (app.globalData.navHeight / 2) : that.topArr[index]);
-			},
-			scroll: function(e) {
-				var that = this,
-				scrollY = e.detail.scrollTop;
-				var opacity = scrollY / 200;
-				opacity = opacity > 1 ? 1 : opacity;
-				that.$set(that, 'showAnimate', false);
-				that.$set(that, 'opacity', opacity);
-				that.$set(that, 'scrollY', scrollY);
-				if (that.lock) {
-					that.$set(that, 'lock', false)
-					return;
-				}
-				for (var i = 0; i < that.topArr.length; i++) {
-					if (scrollY < that.topArr[i] - (app.globalData.navHeight / 2) + that.heightArr[i]) {
-						that.$set(that, 'navActive', i)
-						break
-					}
-				}
-			},
-			// 微信登录回调
-			onLoadFun: function(e) {
-				this.getGoodsDetails();
-				this.downloadFilePromotionCode();
-				this.isShowAuth = false
-			},
-			/*
-			 * 获取用户信息
-			 */
-			getUserInfo: function() {
-				let that = this;
-				that.$set(that.sharePacket, 'isState', that.sharePacket.priceName != 0 ? false : true);
-				getUserInfo().then(res => {
-					// that.$set(that, 'uid', res.data.uid);
-				});
-			},
-			/**
-			 * 购物车数量加和数量减
-			 *
-			 */
-			ChangeCartNum: function(changeValue) {
-				//changeValue:是否 加|减
-				//获取当前变动属性
-				let productSelect = this.productValue[this.attrValue];
-				//如果没有属性,赋值给商品默认库存
-				if (productSelect === undefined && !this.attr.productAttr.length)
-					productSelect = this.attr.productSelect;
-				//无属性值即库存为0；不存在加减；
-				if (productSelect === undefined) return;
-				let stock = this.combinationInfo.self_count ? this.combinationInfo.self_count : 999999999;
-				let num = this.attr.productSelect;
-				if (changeValue) {
-					num.cart_num++;
-					if (num.cart_num > stock) {
-						this.$set(this.attr.productSelect, "cart_num", stock);
-						this.$set(this, "cart_num", stock);
-						uni.showToast({
-							title: `每人限购${stock}件`,
-							icon: 'none'
-						})
-					}
-				} else {
-					num.cart_num--;
-					if (num.cart_num < 1) {
-						this.$set(this.attr.productSelect, "cart_num", 1);
-						this.$set(this, "cart_num", 1);
-					}
-				}
-			},
-			attrVal(val) {
-				this.$set(this.attr.productAttr[val.indexw], 'index', this.attr.productAttr[val.indexw].attr_values[val.indexn]);
-			},
-			/**
-			 * 属性变动赋值
-			 *
-			 */
-			ChangeAttr: function(res) {
-				let productSelect = this.productValue[res];
-				if (productSelect && productSelect.stock > 0) {
-					this.$set(this.attr.productSelect, "image", productSelect.image);
-					this.$set(this.attr.productSelect, "price", productSelect.price);
-					this.$set(this.attr.productSelect, "stock", productSelect.stock);
-					this.$set(this.attr.productSelect, "unique", productSelect.unique);
-					this.$set(this.attr.productSelect, "cart_num", 1);
-					this.$set(this, "attrValue", res);
-					this.$set(this, "attrTxt", "已选择");
-				} else {
-					this.$set(this.attr.productSelect, "image", this.storeInfo.image);
-					this.$set(this.attr.productSelect, "price", this.storeInfo.price);
-					this.$set(this.attr.productSelect, "stock", 0);
-					this.$set(this.attr.productSelect, "unique", "");
-					this.$set(this.attr.productSelect, "cart_num", 0);
-					this.$set(this, "attrValue", "");
-					this.$set(this, "attrTxt", "请选择");
-				}
-			},
-			setClientHeight: function() {
-				let that = this;
-				let view = uni.createSelectorQuery().in(this).select("#list0");
-				view.fields({
-					size: true,
-				}, data => {
-					that.$set(that, 'clientHeight', data.height + 20)
-				}).exec();
-			},
-			/**
-			 * 获取产品详情
-			 *
-			 */
-			getGoodsDetails: function() {
-				uni.showLoading({
-					title: '加载中',
-					mask: true
-				});
-				let that = this;
-				getCombinationDetail(that.id).then(res => {
-					uni.hideLoading();
-					let storeInfo = res.data.product;
-					let combinationInfo = res.data;
-					if (storeInfo.video_link && storeInfo.slider_image.length > 1) {
-						this.videoCoverImg = storeInfo.slider_image[0]
-						storeInfo.slider_image.splice(0, 1)
-					} else if (storeInfo.video_link && storeInfo.slider_image.length === 1) {
-						this.videoCoverImg = storeInfo.slider_image[0]
-					}
-					that.$set(that, 'combinationInfo', combinationInfo);
-					that.$set(that, 'storeInfo', storeInfo);
-					that.$set(that, 'description', storeInfo.content);
-					that.$set(that, 'reply', res.data.product.topReply ? [res.data.product.topReply] : []);
-					that.$set(that, 'replyCount', res.data.product.replayData && res.data.product.replayData.count);
-					that.$set(that, 'replyChance', res.data.product.replayData && res.data.product.replayData.rate);
-					that.$set(that.attr, 'productAttr', res.data.product.attr);
-					that.$set(that, 'productValue', res.data.product.sku);
-					that.$set(that.sharePacket, 'priceName', res.data.product.priceName);
-					that.$set(that.sharePacket, 'max', res.data.product.max_extension);
-					that.$set(that.sharePacket, 'min', res.data.product.min_extension);
-					that.$set(that, 'systemStore', res.data.product.system_store);
-					that.$set(that, 'PromotionCode', storeInfo.code_base);
-					that.$set(that, 'pink', res.data.groupBuying);
-					that.$set(that, 'itemNew', res.data.successUser);
-					that.$set(that, 'shippingValue', res.data.product.temp ? res.data.product.temp.name : '');
-					that.$set(that, 'guaranteeValue', res.data.product.guarantee ? res.data.product.guarantee.template_name : '');
-					that.$set(that, 'guarantee', res.data.product.guaranteeTemplate ? res.data.product.guaranteeTemplate : []);
-					that.$set(that, 'shipping', res.data.product.temp ? res.data.product.temp.info : '');
-					that.$set(that.specsInfo, 'params', res.data.product.params);	
-					uni.setNavigationBarTitle({
-						title: storeInfo.store_name.substring(0, 7) + "..."
-					})
-					that.$set(that, 'storeImage', that.storeInfo.image);
-					// #ifdef H5
-					if (that.isLogin) {
-						that.getCartCount();
-						that.ShareInfo();
-						that.downloadFilePromotionCode();
-					};
-					// #endif
-					// #ifdef APP-PLUS || MP
-					that.getCartCount();
-					// #endif
-					setTimeout(function() {
-						that.infoScroll();
-					}, 500);
-					that.DefaultSelect();
-					that.getPricrRule(that.storeInfo.cate_id);
-					// 找到最小定金金额
-					let objs = Object.keys(res.data.product.sku);
-					let m = objs.map(key => res.data.product.sku[key]);
-					this.minNum = Math.min.apply(Math, m.map(function(o) {
-						return o.down_price
-					}))
-				}).catch(res => {
-					uni.hideLoading();
-					return that.$util.Tips({
-						title: res
-					}, {
-						tab: 3,
-						url: 1
-					});
-				})
-			},
-			infoScroll: function() {
-				var that = this,
-					topArr = [],
-					heightArr = [];
-				for (var i = 0; i < that.navList.length; i++) { //productList
-					//获取元素所在位置
-					var query = uni.createSelectorQuery().in(this);
-					var idView = "#past" + i;
-					query.select(idView).boundingClientRect();
-					query.exec(function(res) {
-						var top = res[0].top;
-						var height = res[0].height;
-						topArr.push(top);
-						heightArr.push(height);
-						that.$set(that, 'topArr', topArr);
-						that.$set(that, 'heightArr', heightArr);
-					});
-				};
-			},
-			/**
-			 * 拨打电话
-			 */
-			makePhone: function() {
-				uni.makePhoneCall({
-					phoneNumber: this.systemStore.phone
-				})
-			},
-			/**
-			 * 默认选中属性
-			 *
-			 */
-			DefaultSelect: function() {
-				let productAttr = this.attr.productAttr;
-				let value = [];
-				let arr = []
-				let unSortArr = []
-				for (var key in this.productValue) {
-					if (this.productValue[key].stock > 0) {
-						value = this.attr.productAttr.length ? key.split(",") : [];
-						break;
-					}
-				}
-				for (let i = 0; i < productAttr.length; i++) {
-					this.$set(productAttr[i], "index", value[i]);
-				}
-				//sort();排序函数:数字-英文-汉字；
-				let productSelect = this.productValue[value.join(",")];
-				if (productSelect && productAttr.length) {
-					this.$set(
-						this.attr.productSelect,
-						"store_name",
-						this.storeInfo.store_name
-					);
-					this.$set(this.attr.productSelect, "image", productSelect.image);
-					this.$set(this.attr.productSelect, "price", productSelect.price);
-					this.$set(this.attr.productSelect, "stock", productSelect.stock);
-					this.$set(this.attr.productSelect, "unique", productSelect.unique);
-					this.$set(this, "attrValue", value.join(","));
-					this.$set(this, "attrTxt", "已选择");
-					if (productSelect.stock == 0) {
-						this.$set(this.attr.productSelect, "cart_num", 0);
-					} else {
-						this.$set(this.attr.productSelect, "cart_num", 1);
-					}
-				} else if (!productSelect && productAttr.length) {
-					this.$set(
-						this.attr.productSelect,
-						"store_name",
-						this.storeInfo.store_name
-					);
-					this.$set(this.attr.productSelect, "image", this.storeInfo.image);
-					this.$set(this.attr.productSelect, "price", this.storeInfo.price);
-					this.$set(this.attr.productSelect, "stock", 0);
-					this.$set(this.attr.productSelect, "unique", "");
-					this.$set(this.attr.productSelect, "cart_num", 0);
-					this.$set(this, "attrValue", "");
-					this.$set(this, "attrTxt", "请选择");
-				} else if (!productSelect && !productAttr.length) {
-					this.$set(
-						this.attr.productSelect,
-						"store_name",
-						this.storeInfo.store_name
-					);
-					this.$set(this.attr.productSelect, "image", this.storeInfo.image);
-					this.$set(this.attr.productSelect, "price", this.storeInfo.price);
-					this.$set(this.attr.productSelect, "stock", this.storeInfo.stock);
-					this.$set(
-						this.attr.productSelect,
-						"unique",
-						this.storeInfo.unique || ""
-					);
-					this.$set(this.attr.productSelect, "cart_num", 1);
-					this.$set(this, "attrValue", "");
-					this.$set(this, "attrTxt", "请选择");
-				} else if (productSelect && !productAttr.length) {
-					this.$set(
-						this.attr.productSelect,
-						"store_name",
-						this.storeInfo.store_name
-					);
-					this.$set(this.attr.productSelect, "image", productSelect.image);
-					this.$set(this.attr.productSelect, "price", productSelect.price);
-					this.$set(this.attr.productSelect, "stock", productSelect.stock);
-					this.$set(this.attr.productSelect, "unique", productSelect.unique);
-
-					this.$set(this, "attrValue", value.join(","));
-					this.$set(this, "attrTxt", "已选择");
-					if (productSelect.stock == 0) {
-						this.$set(this.attr.productSelect, "cart_num", 0);
-					} else {
-						this.$set(this.attr.productSelect, "cart_num", 1);
-					}
-				}
-			},
-			/*
-			 *  单独购买
-			 */
-			openAlone: function() {
-				uni.navigateTo({
-					url: `/pages/goods_details/index?id=${this.storeInfo.old_product_id}`
-				})
-			},
-			/**
-			 *
-			 *
-			 * 收藏商品
-			 */
-			setCollect: function() {
-				if (this.isLogin === false) {
-					this.isAuto = true;
-					this.isShowAuth = true
-				} else {
-					let that = this;
-					if (this.storeInfo.isRelation) {
-						collectDel({
-							type: 4,
-							type_id: this.combinationInfo.product_group_id
-						}).then(res => {
-							that.$set(that.storeInfo, 'isRelation', !that.storeInfo.isRelation);
-						})
-					} else {
-						collectAdd({
-							type_id: this.combinationInfo.product_group_id,
-							type: 4
-						}).then(res => {
-							that.$set(that.storeInfo, 'isRelation', !that.storeInfo.isRelation);
-						})
-					}
-				}
-			},
-			/**
-			 * 打开属性插件
-			 */
-			selecAttr: function() {
-				this.$set(this.attr, 'cartAttr', true);
-				this.$set(this, 'isOpen', true);
-			},
-			onMyEvent: function() {
-				this.$set(this.attr, 'cartAttr', false);
-				this.$set(this, 'isOpen', false);
-			},
-			/**
-			 * 打开属性加入购物车
-			 *
-			 */
-			joinCart: function(e) {
-				//是否登录
-				if (this.isLogin === false) {
-					this.isAuto = true;
-					this.isShowAuth = true
-				} else {
-					this.goCat();
-				}
-			},
-			/*
-			 * 加入购物车
-			 */
-			goCat: function(news) {
-				let that = this,
-					productSelect = that.productValue[this.attrValue];
-				//打开属性
-				if (that.attrValue) {
-					//默认选中了属性，但是没有打开过属性弹窗还是自动打开让用户查看默认选中的属性
-					that.attr.cartAttr = !that.isOpen ? true : false;
-				} else {
-					if (that.isOpen) that.attr.cartAttr = true;
-					else that.attr.cartAttr = !that.attr.cartAttr;
-				}
-				//只有关闭属性弹窗时进行加入购物车
-				if (that.attr.cartAttr === true && that.isOpen === false)
-					return (that.isOpen = true);
-				//如果有属性,没有选择,提示用户选择
-				if (
-					that.attr.productAttr.length &&
-					that.isOpen === true &&
-					productSelect.stock == 0
-				)
-					return that.$util.Tips({
-						title: "产品库存不足，请选择其它"
-					});
-				let q = {
-					is_new: 1,
-					product_id: that.id,
-					cart_num: that.attr.productSelect.cart_num,
-					product_attr_unique: that.attr.productSelect !== undefined ? that.attr.productSelect.unique : "",
-					product_type: 4,
-					spread_id: this.currSpid
-				};
-				postCartAdd(q)
-					.then(function(res) {
-						that.isOpen = false;
-						that.attr.cartAttr = false;
-						if (news) {
-							uni.navigateTo({
-								url: '/pages/users/order_confirm/index?cartId=' + res.data.cart_id
-							});
-						} else {
-							that.$util.Tips({
-								title: "添加购物车成功",
-								success: () => {
-									that.getCartCount(true);
-								}
-							});
-						}
-					})
-					.catch(res => {
-						that.isOpen = false;
-						return that.$util.Tips({
-							title: res
-						});
-					});
-			},
-			/**
-			 * 获取购物车数量
-			 * @param boolean 是否展示购物车动画和重置属性
-			 */
-			getCartCount: function(isAnima) {
-				let that = this;
-				const isLogin = that.isLogin;
-				if (isLogin) {
-					getCartCounts().then(res => {
-						that.CartCount = res.data[0].count;
-						//加入购物车后重置属性
-						if (isAnima) {
-							that.animated = true;
-							setTimeout(function() {
-								that.animated = false;
-							}, 500);
-						}
-					});
-				}
-			},
-			/**
-			 * 立即购买
-			 */
-			goBuy: function(e) {
-				if (this.isLogin === false) {
-					this.isAuto = true;
-					this.isShowAuth = true
-				} else {
-					this.goCat(true);
-				}
-			},
-			// 授权关闭
-			authColse: function(e) {
-				this.isShowAuth = e
-			},
-			/**
-			 * 分享打开
-			 *
-			 */
-			listenerActionSheet: function() {
-				if (this.isLogin === false) {
-					this.isAuto = true;
-					this.isShowAuth = true
-				} else {
-					// #ifdef H5
-					if (this.$wechat.isWeixin() === true) {
-						this.weixinStatus = true;
-					}
-					// #endif
-					this.posters = true;
-				}
-			},
-			// 分享关闭
-			listenerActionClose: function() {
-				this.posters = false;
-			},
-			//隐藏海报
-			posterImageClose: function() {
-				this.posterImageStatus = false
-			},
-			//替换安全域名
-			setDomain: function(url) {
-				url = url ? url.toString() : '';
-				//本地调试打开,生产请注销
-				if (url.indexOf("https://") > -1) return url;
-				else return url.replace('http://', 'https://');
-			},
-			/**
-			 * 获取产品分销二维码
-			 * @param function successFn 下载完成回调
-			 *
-			 */
-			downloadFilePromotionCode: function(successFn) {
-				let that = this;
-				let type;
-				// #ifndef MP
-				type = 'wechat'
-				// #endif
-				// #ifdef MP
-				type = 'routine'
-				// #endif
-				getProductCode(that.id, {
-					type: type,
-					product_type: 4
-				}).then(async res => {
-					this.codeImg = res.data.url;
-					that.$set(that, 'isDown', false);
-				}).catch(err => {
-					that.$util.Tips({
-						title: err
-					});
-					that.posters = false;
-					that.$set(that, 'isDown', false);
-					that.$set(that, 'PromotionCode', '');
-				});
-			},
-			// 小程序关闭分享弹窗；
-			goFriend: function() {
-				this.posters = false;
-			},
-			/**
-			 * 生成海报
-			 */
-			async goPoster() {
-				if (this.posterImage) {
-					this.posterImageStatus = true
-					this.posters = false
-					return
-				}
-				let that = this;
-				let arr2
-				that.posters = false;
-				that.$set(that, 'canvasStatus', true);
-				uni.showLoading({
-					title: '海报生成中',
-					mask: true
-				});
-				// #ifdef MP || APP-PLUS
-				arr2 = [that.posterbackgd, await this.fileStoreImage(this.storeImage), await this.fileStoreImage(
-					this.codeImg), await that.fileStoreImage(that.share_pic)];
-				// #endif
-				// #ifdef H5
-				arr2 = [that.posterbackgd, await this.imgToBase(that.storeImage), await this.imgToBase(this.codeImg), await that.imgToBase(that.share_pic)];
-				// #endif
-				//生成推广海报
-				that.$util.goodsPosterCanvas(arr2, that.storeInfo.store_name, that.storeInfo.price, that.site_name, that.storeInfo.ot_price, function(tempFilePath) {
-					that.$set(that, 'posterImage', tempFilePath);
-					that.$set(that, 'posterImageStatus', true);
-					that.$set(that, 'canvasStatus', false);
-					that.$set(that, 'actionSheetHidden', !that.actionSheetHidden);
-				}, (err) => {
-					that.$set(that, 'canvasStatus', false);
-				});
-			},
-			/*
-			 * 保存到手机相册
-			 */
-			savePosterPath: function() {
-				let that = this;
-				// #ifdef MP
-				uni.getSetting({
-					success(res) {
-						if (!res.authSetting['scope.writePhotosAlbum']) {
-							uni.authorize({
-								scope: 'scope.writePhotosAlbum',
-								success() {
-									uni.saveImageToPhotosAlbum({
-										filePath: that.posterImage,
-										success: function(res) {
-											that.posterImageClose();
-											that.$util.Tips({
-												title: '保存成功',
-												icon: 'success'
-											});
-										},
-										fail: function(res) {
-											that.$util.Tips({
-												title: '保存失败'
-											});
-										}
-									})
-								}
-							})
-						} else {
-							uni.saveImageToPhotosAlbum({
-								filePath: that.posterImage,
-								success: function(res) {
-									that.posterImageClose();
-									that.$util.Tips({
-										title: '保存成功',
-										icon: 'success'
-									});
-								},
-								fail: function(res) {
-									that.$util.Tips({
-										title: '保存失败'
-									});
-								},
-							})
-						}
-					}
-				})
-				// #endif
-				// #ifdef APP-PLUS
-				uni.saveImageToPhotosAlbum({
-					filePath: that.posterImage,
-					success: function(res) {
-						that.posterImageClose();
-						that.$util.Tips({
-							title: '保存成功',
-							icon: 'success'
-						});
-					},
-					fail: function(res) {
-						that.$util.Tips({
-							title: '保存失败'
-						});
-					},
-				})
-				// #endif
-			},
-			//#ifdef H5
-			ShareInfo() {
-				let data = this.storeInfo;
-				let href = location.href;
-				if (this.$wechat.isWeixin()) {
-					getUserInfo().then(res => {
-						href =
-							href.indexOf("?") === -1 ?
-							href + "?spid=" + res.data.uid :
-							href + "&spid=" + res.data.uid;
-						let configAppMessage = {
-							desc: data.store_info,
-							title: data.store_name,
-							link: href,
-							imgUrl: data.image
-						};
-						this.$wechat.wechatEvevt([
-							"updateAppMessageShareData",
-							"updateTimelineShareData",
-							"onMenuShareAppMessage",
-							"onMenuShareTimeline"
-						], configAppMessage).then(res => {
-							// console.log(res, '=============================>>WXAPI');
-						}).catch(err => {
-							// console.log(err);
-						})
-					});
-				}
-			},
-			//#endif
-			async imgToBase(url) {
-				let res = await imgToBase({
-					image: url
-				})
-				return res.data.image
-			},
-			//图片转符合安全域名路径
-			fileStoreImage(url) {
-				// #ifdef MP
-				let ishttps = url.split('//')[0] == 'https:'
-				if (!ishttps) {
-					url = 'https://'+url.split('//')[1]
-				}
-				// #endif
-				return new Promise((resolve, reject) => {
-					let that = this;
-					uni.downloadFile({
-						url: url,
-						success: function(res) {
-							resolve(res.tempFilePath);
-						},
-						fail: function() {
-							return that.$util.Tips({
-								title: ''
-							});
-						}
-					});
-				})
-			},
-			//复制口令
-			copyPwd(){
-				let that = this;
-				copyPasswordApi({
-					id: that.id,
-					product_type: 4
-				}).then(async res => {
-					that.copyUrl = res.data.str;
-					that.posters = false
-					that.isCopy = true;
-				})
-			},
-			closeCopy(){
-				this.isCopy = false
-			},
-		},
-	}
-</script>
-<style scoped lang="scss">
-	.font-bg-red{
-		position: relative;
-		top: -3rpx;
-		background-color: var(--view-theme);
-		border: 1px solid var(--view-theme);
-	}
-	.p-color {
-		color: var(--view-priceColor);
-	}
-	.t-color {
-		color: var(--view-theme);
-	}
-	.product-con .nav {
-		background-repeat: no-repeat;
-		background-size: 100% 100%;
-		width: 100%;
-		height: 100rpx;
-		padding: 0 30rpx;
-		box-sizing: border-box;
-	}
-	.product-con .nav .money {
-		font-size: 28rpx;
-		color: #fff;
-		.num {
-			font-size: 48rpx;
-		}
-	}
-	page {
-		background-color: #f5f5f5;
-	}
-	.orig_price {
-		text-decoration: line-through;
-		font-weight: normal;
-		margin-left: 10rpx;
-	}
-	.font-gray {
-		color: #82848F;
-	}
-	.product-con .notice {
-		width: 100%;
-		height: 62rpx;
-		background-color: var(--view-minorColor);
-		padding: 0 30rpx;
-		box-sizing: border-box;
-	}
-	.product-con .notice .num {
-		font-size: 24rpx;
-	}
-	.product-con .notice .num .iconfont {
-		font-size: 30rpx;
-		vertical-align: -3rpx;
-		margin-right: 20rpx;
-	}
-	.product-con .notice .num .line {
-		color: #282828;
-		margin-left: 15rpx;
-	}
-	.product-con .notice .swiper {
-		height: 100%;
-		width: 360rpx;
-		line-height: 62rpx;
-		overflow: hidden;
-		margin-left: 14rpx;
-	}
-	.product-con .notice .swiper swiper {
-		height: 100%;
-		width: 100%;
-		overflow: hidden;
-		font-size: 24rpx;
-		color: #282828;
-	}
-	.product-con .assemble {
-		background-color: #fff;
-	}
-	.product-con .assemble .item {
-		padding-right: 30rpx;
-		margin-left: 30rpx;
-		height: 132rpx;
-	}
-	.product-con .assemble .item .pictxt {
-		width: 295rpx;
-	}
-	.product-con .assemble .item .pictxt .text {
-		width: 194rpx;
-	}
-	.product-con .assemble .item .pictxt .pictrue {
-		width: 80rpx;
-		height: 80rpx;
-	}
-	.product-con .assemble .item .pictxt .pictrue image {
-		width: 100%;
-		height: 100%;
-		border-radius: 50%;
-	}
-	.product-con .assemble .item .right .lack {
-		font-size: 24rpx;
-		color: #333333;
-	}
-	.product-con .assemble .item .right .time {
-		position: relative;
-		left: -10rpx;
-		font-size: 22rpx;
-		color: #82848f;
-		margin-top: 5rpx;
-		display: inline;
-	}
-	.product-con .assemble .item .right .spellBnt {
-		font-size: 24rpx;
-		color: #fff;
-		width: 140rpx;
-		height: 50rpx;
-		border-radius: 50rpx;
-		background-image: linear-gradient(to right, var(--view-bntColor21) 0%, var(--view-bntColor22) 100%);
-		text-align: center;
-		line-height: 50rpx;
-		margin-left: 30rpx;
-	}
-	.product-con .assemble .item .right .spellBnt .iconfont {
-		font-size: 25rpx;
-		margin-left: 5rpx;
-	}
-	.product-con .assemble .more {
-		font-size: 24rpx;
-		color: #282828;
-		text-align: center;
-		height: 90rpx;
-		line-height: 90rpx;
-	}
-	.product-con .assemble .more .iconfont {
-		margin-left: 13rpx;
-		font-size: 25rpx;
-	}
-	.product-con .nav .time {
-		font-size: 20rpx;
-		color: #fff;
-		text-align: center;
-	}
-	.product-con .nav .iconfont {
-		color: #fff;
-		font-size: 30rpx;
-		margin-left: 20rpx;
-	}
-	.product-con .wrapper {
-		padding: 32rpx 32rpx 26rpx;
-		width: 100%;
-		box-sizing: border-box;
-	}
-	.product-con .attribute .atterTxt1{
-		color: #282828;
-		&.hasAttr{
-			&:after{
-				content: "";
-				display: inline-block;
-				position: relative;
-				top: -6rpx;
-				margin: 0 6rpx;
-				width: 5rpx;
-				height: 5rpx;
-				background-color: #282828;
-				border-radius: 100%;
-			}
-			&:last-child{
-				&:after{
-					display: none;
-				}
-			}
-		}
-	}
-	.product-con .guaranteeAttr{
-		display: inline-block;
-		width: 560rpx;
-		overflow: hidden;white-space: nowrap;text-overflow: ellipsis;
-	}
-	.product-con .price_text {
-		display: inline-block;
-		width: 90rpx;
-		height: 30rpx;
-		background: url(~pages/activity/static/images/presell_text.png);
-		background-size: 100%;
-		color: #FD6523;
-		font-size: 22rpx;
-		line-height: 30rpx;
-		text-align: center;
-		margin-left: 27rpx;
-		position: relative;
-		top: -8rpx;
-	}
-	.product-con .wrapper .introduce {
-		margin: 0;
-		padding-right: 40rpx;
-		position: relative;
-		margin: 20rpx 0 0;
-		.icon-fenxiang {
-			position: absolute;
-			top: 0;
-			right: 0;
-		}
-	}
-	.product-con .wrapper .introduce .infor {
-		width: 570rpx;
-	}
-	.product-con .wrapper .introduce .iconfont {
-		font-size: 37rpx;
-		color: #515151;
-	}
-	.product-con .wrapper .label {
-		margin: 18rpx 0 0 0;
-		font-size: 24rpx;
-		color: #82848f;
-	}
-	.product-con .wrapper .label .stock {
-		width: 255rpx;
-		margin-right: 28rpx;
-	}
-	.product-con .playWay {
-		background-color: #fff;
-		padding: 0 30rpx;
-		margin-top: 20rpx;
-		font-size: 28rpx;
-		color: #282828;
-	}
-	.product-con .playWay .title {
-		height: 86rpx;
-		border-bottom: 1px solid #eee;
-	}
-	.product-con .playWay .title .iconfont {
-		margin-left: 13rpx;
-		font-size: 28rpx;
-		color: #717171;
-	}
-	.product-con .playWay .way {
-		min-height: 110rpx;
-		font-size: 26rpx;
-		color: #282828;
-	}
-	.product-con .playWay .way .iconfont {
-		color: #cdcdcd;
-		font-size: 40rpx;
-		margin: 0 35rpx;
-	}
-	.product-con .playWay .way .item .num {
-		font-size: 34rpx;
-		margin-right: 6rpx;
-		width: 17px;
-		height: 28px;
-		display: inline-block;
-		vertical-align: middle;
-	}
-	.product-con .playWay .way .item .tip {
-		font-size: 22rpx;
-		color: #a5a5a5;
-		margin-top: -4rpx;
-	}
-	.product-con .playWay .way .way_text {
-		position: relative;
-		top: 4rpx;
-	}
-	.head-bar {
-		background: #fff;
-	}
-	.generate-posters {
-		width: 100%;
-		height: 170rpx;
-		background-color: #fff;
-		position: fixed;
-		left: 0;
-		bottom: 0;
-		z-index: 388;
-		transform: translate3d(0, 100%, 0);
-		transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
-		border-top: 1px solid #eee;
-	}
-	.generate-posters.on {
-		transform: translate3d(0, 0, 0);
-	}
-	.generate-posters .item {
-		/* #ifdef H5 */
-		flex: 50%;
-		/* #endif */
-		/* #ifndef H5 */
-		flex: 33.33%;
-		/* #endif */
-		text-align: center;
-		font-size: 30rpx;
-		&.item3{
-			flex: 33.33%
-		}
-	}
-	.generate-posters .item .iconfont {
-		font-size: 80rpx;
-		color: #5eae72;
-	}
-	.generate-posters .item .iconfont.icon-haibao {
-		color: #5391f1;
-	}
-	.generate-posters .item .iconfont.icon-fuzhikouling1 {
-		color: #FBB324;
-	}
-	.product-con .mask {
-		z-index: 88;
-	}
-	.product-con .footer {
-		padding: 0 20rpx 0 80rpx;
-		position: fixed;
-		left: 0;
-		bottom: 0;
-		width: 100%;
-		box-sizing: border-box;
-		height: 100rpx;
-		height: calc(100rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
-		height: calc(100rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
-		background-color: #fff;
-		z-index: 277;
-		border-top: 1px solid #f0f0f0;
-	}
-	.product-con .footer .item {
-		font-size: 18rpx;
-		color: #666;
-		text-align: center;
-	}
-	.product-con .footer .item .iconfont {
-		text-align: center;
-		font-size: 40rpx;
-	}
-	.product-con .footer .item .iconfont.icon-shoucang1 {
-		color: var(--view-priceColor);
-	}
-	.product-con .footer .item .iconfont.icon-gouwuche1 {
-		font-size: 40rpx;
-		position: relative;
-	}
-	.product-con .footer .item .iconfont.icon-gouwuche1 .num {
-		color: #fff;
-		position: absolute;
-		font-size: 18rpx;
-		padding: 2rpx 8rpx 3rpx;
-		border-radius: 200rpx;
-		top: -10rpx;
-		right: -10rpx;
-	}
-	.product-con .footer .bnt {
-		width: 444rpx;
-		height: 76rpx;
-	}
-	.product-con .footer .bnt .bnts {
-		width: 222rpx;
-		text-align: center;
-		line-height: 76rpx;
-		color: #fff;
-		font-size: 28rpx;
-	}
-	.product-con .footer .bnt .joinCart {
-		border-radius: 50rpx 0 0 50rpx;
-		background-image: linear-gradient(to right, var(--view-bntColor11) 0%, var(--view-bntColor12) 100%);
-	}
-	.product-con .footer .bnt .buy {
-		border-radius: 0 50rpx 50rpx 0;
-		background-image: linear-gradient(to right, var(--view-bntColor21) 0%, var(--view-bntColor22) 100%);
-	}
-	.product-con .footer .bnt .joinCart[disabled] {
-		background: #bbb;
-	}
-	.product-con .footer .bnt .buy[disabled] {
-		background: #bbb;
-	}	
-	button {
-		padding: 0;
-		margin: 0;
-		line-height: normal;
-		background-color: #fff;
-	}
-	button::after {
-		border: 0;
-	}
-	action-sheet-item {
-		padding: 0;
-		height: 240rpx;
-		align-items: center;
-		display: flex;
-	}
-	.contact {
-		font-size: 16px;
-		width: 50%;
-		background-color: #fff;
-		padding: 8rpx 0;
-		border-radius: 0;
-		margin: 0;
-		line-height: 2;
-	}
-	.contact::after {
-		border: none;
-	}
-	.canvas {
-		z-index: 300;
-		width: 750px;
-		height: 1190px;
-	}
-	.poster-pop {
-		width: 600rpx;
-		height: 897rpx;
-		position: fixed;
-		left: 50%;
-		transform: translateX(-50%);
-		z-index: 399;
-		top: 50%;
-		margin-top: -500rpx;
-	}
-	.poster-pop image {
-		width: 100%;
-		height: 100%;
-		display: block;
-	}
-	.poster-pop .close {
-		width: 46rpx;
-		height: 75rpx;
-		position: fixed;
-		right: 0;
-		top: -73rpx;
-		display: block;
-	}
-	.poster-pop .save-poster {
-		background-color: #df2d0a;
-		font-size: ：22rpx;
-		color: #fff;
-		text-align: center;
-		height: 76rpx;
-		line-height: 76rpx;
-		width: 100%;
-	}
-	.poster-pop .keep {
-		color: #fff;
-		text-align: center;
-		font-size: 25rpx;
-		margin-top: 10rpx;
-	}
-	.mask {
-		position: fixed;
-		top: 0;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		background-color: rgba(0, 0, 0, 0.6);
-		z-index: 300;
-	}
-	.share-box {
-		z-index: 1000;
-		position: fixed;
-		left: 0;
-		top: 0;
-		width: 100%;
-		height: 100%;
-		image {
-			width: 100%;
-			height: 100%;
-		}
-	}
-	.store-wrapper {
-		margin-top: 20rpx;
-		background-color: #fff;
-		.store-hd {
-			padding: 30rpx;
-			border-bottom: 1px solid #F5F5F5;
-			.store-info {
-				position: relative;
-				display: flex;
-				.logo {
-					width: 86rpx;
-					height: 86rpx;
-					image {
-						width: 86rpx;
-						height: 86rpx;
-						border-radius: 6rpx;
-					}
-				}
-				.info {
-					display: flex;
-					flex-direction: column;
-					justify-content: center;
-					margin-left: 20rpx;
-					.name {
-						font-size: 28rpx;
-						color: #282828;
-						font-weight: bold;
-					}
-					.txt {
-						margin-top: 8rpx;
-						color: #666666;
-						font-size: 22rpx;
-					}
-				}
-				.link {
-					position: absolute;
-					right: 0;
-					top: 50%;
-					transform: translateY(-50%);
-					display: flex;
-					align-items: center;
-					justify-content: center;
-					width: 114rpx;
-					height: 50rpx;
-					line-height: 50rpx;
-					background-image: linear-gradient(-90deg, var(--view-bntColor21) 0%, var(--view-bntColor21) 100%);
-					border-radius: 25rpx;
-					color: #fff;
-				}
-			}
-			.score-wrapper {
-				display: flex;
-				justify-content: space-between;
-				margin-top: 30rpx;
-				.item {
-					color: #948D8C;
-					font-size: 26rpx;
-					text {
-						margin-left: 10rpx;
-						color: var(--view-priceColor);
-					}
-				}
-			}
-		}
-		.con-box {
-			padding: 20rpx 0 20rpx 30rpx;
-			.title {
-				font-size: 28rpx;
-				color: #282828;
-				margin-bottom: 20rpx;
-			}
-			.img-box {
-				display: flex;
-				.img-item {
-					width: 206rpx;
-					margin-right: 15rpx;
-					image,uni-image {
-						width: 206rpx;
-						height: 206rpx;
-						border-radius: 16rpx;
-					}
-					.txt {
-						.title {
-							font-size: 28rpx;
-							color: #282828;
-						}
-						.price {
-							color: var(--view-priceColor);
-							font-size: 28rpx;
-							text {
-								font-size: 20rpx;
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-	.head-wrapper {
-		z-index: 999;
-		display: flex;
-		align-items: center;
-		position: fixed;
-		left: 30rpx;
-		top: 0;
-		/* #ifdef MP */
-		height: 43px;
-		/* #endif */
-		/* #ifdef H5 */
-		height: 114rpx;
-		/* #endif */
-	}
-	.head-menu {
-		display: flex;
-		align-items: center;
-		height: 54rpx;
-		width: 140rpx;
-		background: rgba(0, 0, 0, .25);
-		border-radius: 27rpx;
-		.iconfont {
-			flex: 1;
-			text-align: center;
-			color: #fff;
-			box-sizing: border-box;
-			&.icon-xiangzuo {
-				border-right: 1px solid #fff;
-			}
-		}
-	}
-	.atmosphere {
-		&.share {
-			align-items: flex-start;
-			padding: 20rpx 0 0 !important;
-			.introduce {
-				flex: 1;
-				margin-top: 0;
-			}
-		}
-	}
-</style>
diff --git a/pages/nongKe/food/index.vue b/pages/nongKe/food/index.vue
new file mode 100644
index 0000000..20081fd
--- /dev/null
+++ b/pages/nongKe/food/index.vue
@@ -0,0 +1,1311 @@
+<template>
+	<view style="background-color: #F0F2F5;min-height: 100vh">
+		<view style="height: var(--status-bar-height);"></view>
+		<view class='productList' :style="viewColor">
+			<!-- 顶部 -->
+			<view class="top">
+				<view style="height: 10px;">
+				</view>
+				<view class="head_tit">
+					<view class="" style="display: flex;align-items: center;">
+						<view class="back" @click='backjJump()' style="margin-right:17rpx ;">
+							<view class="iconfont icon-xiangzuo" style="color: #333333;"></view>
+						</view>
+						<view style="font-size: 40rpx;font-weight: 700;transform: skewX(-10deg);">
+							<!-- {{titName}} -->
+							当地美食
+						</view>
+					</view>
+
+					<view style="position: relative;">
+						<!-- <text class='iconfont icon-sousuo'></text>
+			<input placeholder='搜索店铺名称' placeholder-class='placeholder' confirm-type='search' name="search"
+				:value='sotreParam.keyword' @confirm="searchSubmit"></input> -->
+						<u-search borderColor="#FF6D20" bgColor="white" :showAction="false" placeholder="搜索店铺名称"
+							v-model="sotreParam.keyword" class="serch_cls"></u-search>
+						<u--image @tap="searchSubmit" class="img_cls" style="position: absolute; top: 3px;right: 3px;"
+							:showLoading="true" src="/static/images/GXSC/SS.png" width="115.65rpx"
+							height="56.82rpx"></u--image>
+					</view>
+
+				</view>
+			</view>
+			<view class="content">
+				<view class="hot_serch">
+					<!-- <text>热搜:</text> <text>热a搜商品</text> <text>热搜商品</text>
+					<text>热搜sasas商品</text> -->
+				</view>
+
+				<!-- <view class="menu_cls">
+					<u-scroll-list>
+						<view class="menu_li" @click="navGo(item.merchant_category_id)" v-for="item,index in menuList"
+							:key="index">
+							<u--image :showLoading="true" :src="imgList[index]" width="94.63rpx" height="99.63rpx"
+								style="margin-bottom: 20rpx;"></u--image>
+							<text style="display: block;    width: 15vw;">{{item.category_name}}</text>
+						</view>
+					</u-scroll-list>
+				</view> -->
+
+				<view class="goods_list">
+					<view class="goods_card" @click="goStore(item.mer_id)" v-for="(item,index) in storeList"
+						:key="index">
+						<view class="left">
+							<u--image :showLoading="true" :src="item.mer_avatar" width="157.71rpx"
+								height="157.71rpx"></u--image>
+						</view>
+						<view class="right">
+							<view class="li head" style="display: flex;">
+								<text class="com_name">{{item.mer_name}}</text>
+								<text
+									style="font-weight: normal; font-size: 10rpx;color: red;padding:0 10rpx; border-radius: 10rpx; border: 1px solid red;">{{item.type_name}}</text>
+							</view>
+							<view class="li">
+								<u--image v-for="item,index in [1,1,,1,1,1]" :key="index" :showLoading="true"
+									src="/static/images/GXSC/PF.png" width="20.85rpx" height="19.85rpx"></u--image>
+								<text style="margin-left: 20rpx;color: #FF6D20; ">5.0</text>
+								<text>月销2000+</text>
+							</view>
+							<view class="li" style="align-items: center;">
+								<u--image :showLoading="true" src="/static/images/GXSC/DH.png" width="33.85rpx"
+									height="33.85rpx"></u--image>
+								<text> {{item.service_phone}}</text>
+							</view>
+							<view class="li" style="align-items: center;">
+								<u--image :showLoading="true" src="/static/images/GXSC/SJ.png" width="33.85rpx"
+									height="33.85rpx"></u--image>
+								<text>{{item.mer_take_time[0]}}-{{item.mer_take_time[1]}}</text>
+							</view>
+							<view class="li" style="align-items: center;">
+								<u--image :showLoading="true" src="/static/images/GXSC/DW.png" width="33.85rpx"
+									height="33.85rpx"></u--image>
+								<text class="address">{{item.mer_address}}</text>
+							</view>
+						</view>
+
+					</view>
+
+				</view>
+
+
+			</view>
+
+			<!-- 热搜 -->
+
+
+
+			<!-- <view class="nav-wrapper" :class="'styleType'+store_street_theme">
+				<view class='nav acea-row row-middle' :class="'styleType'+store_street_theme">
+					<view v-for="item in downMenus" :key="item.key" class='item'
+						:class="{'font-colors':firstKey == item.key}" @click='set_where(item.key)'>
+						<view class="">
+							{{item.title}}
+						</view>
+						<view class="line" :class="{'font-line':firstKey == item.key}">
+						</view>
+					</view>
+
+				</view>
+			</view>
+			
+			 -->
+
+			<!-- 店铺 -->
+			<!-- 
+			<block>
+				<view class="store-wrapper">
+					<view class="store-item" v-for="(item,index) in storeList" :key="index">
+						<view class="head">
+							<view class="bgc_img" :style="{ backgroundImage: `url(${item.mini_banner})`}">
+							</view>
+							<view class="zhezhao">
+							</view>
+							<view class="zhezhao1" @click="goStore(item.mer_id)">
+								<view class="title">
+									<view>{{item.mer_name}}
+									</view>
+									<span>
+										{{item.type_name}}
+									</span>
+								</view>
+								<view class="coent">
+									<view class="avater">
+										<image :src="item.mer_avatar" mode=""></image>
+									</view>
+									<view class=" text">
+										<view class="text_one">
+											<view class="">
+												<image src="@/static/images/phone.png" mode=""></image>
+												{{item.service_phone}}
+											</view>
+											<view class="text_one_r">
+												<image src="@/static/images/clock.png" mode=""></image>
+												{{item.mer_take_time[0]}}-{{item.mer_take_time[1]}}
+											</view>
+										</view>
+										<view class="text_two">
+											<image src="@/static/images/shangpu.png" mode=""></image>
+											{{item.mer_info}}
+										</view>
+										<view class="text_three">
+											<image src="@/static/images/dingwei.png" mode=""></image>
+											{{item.mer_address}}
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</block>
+			<block v-if="store_street_theme == 2">
+				<view class="mer-item2" v-for="(item,index) in storeList" :key='index'>
+					<view class="mer-hd mer-shop-count" @click="goStore(item.mer_id)">
+						<image class="mer-avatar" :src="item.mer_avatar"></image>
+						<view class="mer-shop-right">
+							<view class="mer-count">
+								<view class="mer-top">
+									<view class="txt line1">{{item.mer_name}}</view>
+									<text v-if="item.type_name" class="font-bg-red ml8">{{item.type_name}}</text>
+									<text v-else-if="item.is_trader" class="font-bg-red ml8">自营</text>
+								</view>
+								<view class="mer-btn">
+									<view class="">
+										{{item.care_count<10000 ? item.care_count : (item.care_count/10000).toFixed(2)+'万'}}人关注
+									</view>
+									<view class="line" v-if="item.distance"></view>
+									<view class="distance" v-if="item.distance" @click.stop="showStoreLocation(item)">
+										<view class="">
+											{{item.distance}}
+										</view>
+										<view class="iconfont icon-xiangyou"></view>
+									</view>
+								</view>
+							</view>
+							<view class="pro-box">
+								<navigator :url="`/pages/goods_details/index?id=${itemn.product_id}`" hover-class="none"
+									class="pro-item" v-for="(itemn,indexn) in item.recommend" :key='indexn'>
+									<view class="picture">
+										<easy-loadimage mode="widthFix" :image-src="itemn.image"></easy-loadimage>
+										<view v-if="itemn.border_pic"
+											:style="{ backgroundImage: `url(${itemn.border_pic})` }"
+											class="border-picture"></view>
+									</view>
+									<view class="price">
+										<text>￥</text>{{itemn.price}}
+									</view>
+								</navigator>
+							</view>
+						</view>
+					</view>
+				</view>
+			</block>
+			<block v-if="store_street_theme == 3">
+				<view class="mer-item mer-item3" v-for="(item,index) in storeList" :key='index'
+					:style="'background-image:url('+item.mini_banner+')'">
+					<view class="mer-hd" @click="goStore(item.mer_id)">
+						<view class="mer-name">
+							<image :src="item.mer_avatar"></image>
+							<view class="">
+								<view class="mer-top">
+									<view class="txt line1">{{item.mer_name}}</view>
+									<text v-if="item.type_name" class="font-bg-red ml8">{{item.type_name}}</text>
+									<text v-else-if="item.is_trader" class="font-bg-red ml8">自营</text>
+								</view>
+								<view class="mer-btn">
+									<view class="">
+										{{item.care_count<10000 ? item.care_count : (item.care_count/10000).toFixed(2)+'万'}}人关注
+									</view>
+									<view class="line" v-if="item.distance"></view>
+									<view class="distance" v-if="item.distance" @click.stop="showStoreLocation(item)">
+										<view class="">
+											{{item.distance}}
+										</view>
+										<view class="iconfont icon-xiangyou"></view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="pro-box" :class="'styleType'+store_street_theme">
+						<view class="pro-item" v-for="(itemn,indexn) in item.recommend" :key='indexn' v-if="indexn<=2">
+							<view @click="go_details(itemn.product_type,itemn.product_id)">
+								<view class="picture">
+									<image :src="itemn.image"></image>
+									<view v-if="itemn.border_pic"
+										:style="{ backgroundImage: `url(${itemn.border_pic})` }" class="border-picture">
+									</view>
+								</view>
+								<view class="price">
+									<text>￥</text>{{itemn.price}}
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</block>
+			<view class='loadingicon acea-row row-center-wrapper' v-if="loading">
+				<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
+			</view>
+		 -->
+
+
+		</view>
+		<view class='no-shop' v-if="!storeList.length && !loading && !loadingIcon" v-cloak>
+			<view class='pictrue' style="margin: 0 auto;background-color: #F0F2F5;">
+				<image src='../../../static/images/noCart.png'></image>
+				<text>暂无店铺，快去搜索其他店铺吧</text>
+			</view>
+		</view>
+		</block>
+		<u-popup class="pop" :show="show" @close="close" mode="center" bgColor='transparent'>
+			<image :src="image"></image>
+			<image src="@/static/images/guanbi.png" class="guanbi" @click="close"></image>
+		</u-popup>
+	</view>
+
+	</view>
+</template>
+
+<script>
+	import {
+		storeMerchantList,
+		getGeocoder,
+		supMenuApi,
+		supAgoodsApi
+	} from '@/api/store.js';
+
+	import {
+		merClassifly,
+		getStoreTypeApi
+	} from '@/api/store.js';
+	import {
+		mapGetters
+	} from "vuex";
+	import {
+		goShopDetail
+	} from '@/libs/order.js'
+	import {
+		configMap
+	} from '@/utils';
+	import easyLoadimage from '@/components/easy-loadimage/easy-loadimage.vue';
+	const app = getApp();
+	export default {
+		components: {
+			easyLoadimage
+		},
+		data() {
+			return {
+
+				titName: "坝坝宴",
+				price: 0,
+				stock: 0,
+				nows: false,
+				loading: false,
+				loadingIcon: true,
+				loadTitle: '加载更多',
+				title: '',
+				hotPage: 1,
+				hotLimit: 10,
+				hotScroll: false,
+				// 筛选框
+				rightBox: false,
+				//品牌列表
+				brandList: [],
+				downKey: 0,
+				downStatus: false,
+				menuList: [],
+				// 下拉菜单
+				downMenu: [{
+						title: '默认',
+						key: 0,
+						order: ""
+					},
+					{
+						title: '销量',
+						key: 1,
+						order: 'sales'
+					},
+					{
+						title: '好评',
+						key: 2,
+						order: 'rate'
+					},
+					{
+						title: '距离',
+						key: 3,
+						order: 'location'
+					}
+				],
+				// 是否第一个
+				firstKey: 0,
+				// 商铺列表
+				storeList: [],
+				sotreParam: {
+					keyword: '',
+					page: 1,
+					limit: 10,
+					order: '',
+					category_id: '',
+					type_id: '',
+					street_id: '',
+					type_code: '',
+
+				},
+				storeKey: 0,
+				storeScroll: true,
+				mer_id: '',
+				sortId: '',
+				price_on: '',
+				price_off: '',
+				detaile_address: "",
+				recommend_address: "",
+				location_address: "",
+				latitude: "",
+				longitude: "",
+				count: 0,
+				storeTypeArr: [], //店铺类型
+				merList: [], //商户分类
+				product_type: 0,
+				show: false,
+				image: '', //图片,
+				credit_buy: '', //支持先货后款
+			};
+		},
+		onLoad(options) {
+			this.sotreParam.type_code = options.type_code
+			this.storeList = [];
+			if (this.mer_location == 1) {
+				this.selfLocation()
+			}
+			this.storeMerchantList();
+			this.getClassfication();
+			this.getStoreType();
+
+
+
+		},
+		computed: {
+			downMenus: function() {
+				return this.downMenu.filter((item) => {
+					if (this.mer_location) {
+						return item
+					} else {
+						return item.key < 3
+					}
+				})
+			},
+			...configMap({
+				margin_ico_switch: 0,
+				margin_ico: '',
+				mer_location: 0,
+				store_street_theme: 1,
+				hide_mer_status: '',
+			}, mapGetters(['viewColor'])),
+		},
+		methods: {
+			navGo(id) {
+				uni.navigateTo({
+					url: `/pages/nongKe/supply_chain/supplierA?type_id=10&?merchant_category_id=${id}`
+				})
+			},
+			go_details: function(product_type, product_id) {
+				if (product_type == 98) {
+					uni.navigateTo({
+						url: `/pages/admin/goods_details/index?product_id=${product_id}&product_type=${product_type}`
+					})
+				}
+				if (product_type == 0) {
+					uni.navigateTo({
+						url: `/pages/goods_details/index?id=${product_id}`
+					})
+				}
+			},
+			// 获取商户分类
+			getClassfication: function() {
+				let temp = []
+				merClassifly()
+					.then(res => {
+						temp = res.data.map(item => {
+							return {
+								...item,
+								check: false
+							}
+						})
+						if (this.sotreParam.category_id.length > 0) {
+							this.sotreParam.category_id.forEach((ids, index) => {
+								temp.forEach(el => {
+									if (ids == el.merchant_category_id) {
+										el.check = true
+									}
+								})
+							})
+						}
+						this.merList = temp
+					})
+					.catch(res => {
+						this.$util.Tips({
+							title: res
+						});
+					});
+			},
+			// 获取店铺类型
+			getStoreType: function() {
+				let temp = []
+				getStoreTypeApi().then(res => {
+						res.data.forEach(item => {
+							if (item.mer_type_id == this.sotreParam.type_id) {
+								temp.push({
+									...item,
+									check: true
+								})
+							}
+						})
+						this.storeTypeArr = temp
+					})
+					.catch(res => {
+						this.$util.Tips({
+							title: res
+						});
+					});
+			},
+			/** 打开地图**/
+			showMaoLocation(lat, long) {
+				if (!lat || !long) return this.$util.Tips({
+					title: '请设置允许商城访问您的位置！'
+				});
+				//#ifdef H5
+				if (this.$wechat.isWeixin() === true) {
+					this.$wechat.seeLocation({
+						latitude: Number(lat),
+						longitude: Number(long),
+						name: '当前位置',
+						address: this.location_address
+					}).then(res => {
+						// console.log('success');
+					})
+				} else {
+					//#endif
+					uni.openLocation({
+						latitude: parseFloat(lat),
+						longitude: parseFloat(long),
+						name: '当前位置',
+						address: this.location_address,
+						scale: 8,
+						success: function(res) {
+							// console.log(res)
+						},
+					});
+					// #ifdef H5
+				}
+				//#endif	
+			},
+			showStoreLocation(item) {
+				if (!item.lat || !item.long) return this.$util.Tips({
+					title: '请设置允许商城访问您的位置！'
+				});
+				//#ifdef H5
+				if (this.$wechat.isWeixin() === true) {
+					this.$wechat.seeLocation({
+						latitude: Number(item.lat),
+						longitude: Number(item.long),
+						name: item.mer_name,
+						address: item.mer_address ? item.mer_address : '',
+					}).then(res => {
+						// console.log('success');
+					})
+				} else {
+					//#endif
+					uni.openLocation({
+						latitude: parseFloat(item.lat),
+						longitude: parseFloat(item.long),
+						scale: 8,
+						name: item.mer_name,
+						address: item.mer_address ? item.mer_address : '',
+						success: function(res) {
+							// console.log(res)
+						},
+					});
+					// #ifdef H5
+				}
+				//#endif	
+			},
+			selfLocation() {
+				let self = this
+				uni.getLocation({
+					type: 'gcj02',
+					success: (res) => {
+						let latitude, longitude;
+						latitude = res.latitude.toString();
+						longitude = res.longitude.toString();
+						this.latitude = res.latitude
+						this.longitude = res.longitude
+						getGeocoder({
+							lat: latitude,
+							long: longitude
+						}).then(res => {
+							// console.log(res)
+							this.detaile_address = res.data.address;
+							this.location_address = res.data.address;
+							this.recommend_address = res.data.address.length > 4 ? res.data.address
+								.slice(0, 4) + '...' :
+								res.data.address
+						}).catch(err => {
+							uni.showToast({
+								title: err,
+								icon: 'none'
+							})
+						})
+					},
+					fail: (res) => {
+						uni.showToast({
+							title: res,
+							icon: 'none',
+							duration: 1000
+						});
+					},
+				});
+			},
+			// 查找店铺
+			storeMerchantList() {
+				if (this.loading) return
+				this.loading = true
+				let rqData = {
+					keyword: this.sotreParam.keyword,
+					page: this.sotreParam.page,
+					limit: 10,
+					type_code: this.sotreParam.type_code,
+				}
+				if (this.latitude) {
+					rqData.location = this.latitude + ',' + this.longitude
+				}
+				// console.log(rqData)
+				storeMerchantList(rqData).then(res => {
+					this.count = res.data.count
+					this.storeList = this.storeList.concat(res.data.list)
+					this.loading = false
+					this.loadingIcon = false
+					// this.titName = this.storeList[0].mer_info
+				})
+			},
+			// 进店
+			goStore(id) {
+				if (this.sotreParam.type_id == 12) {
+					uni.navigateTo({
+						url: `/pages/nongKe/supply_chain/merchant?id=${id}`
+					})
+				} else {
+					if (this.hide_mer_status != 1) {
+						uni.navigateTo({
+							url: `/pages/store/home/index?id=${id}&type=7`
+						})
+					}
+				}
+			},
+			searchSubmit: function() {
+				let that = this;
+				that.$set(that.sotreParam, 'keyword', this.sotreParam.keyword);
+				this.set_where(this.firstKey)
+			},
+			// 右侧切换
+			bindRight() {
+				this.sotreParam.page = 1
+				this.rightBox = true
+			},
+			// 组件确定
+			confirm(data) {
+				let arr1 = [],
+					arr2 = []
+				if (data.storeTypeArr.length == 0) {
+					// this.sotreParam.type_id = ''
+				} else {
+					data.storeTypeArr.forEach(item => {
+						arr1.push(item.mer_type_id)
+					})
+					this.sotreParam.type_id = arr1.toString();
+				}
+				if (data.merList.length == 0) {
+					this.sotreParam.category_id = ''
+				} else {
+					data.merList.forEach(item => {
+						arr2.push(item.merchant_category_id)
+					})
+					this.sotreParam.category_id = arr2.toString();
+				}
+				this.rightBox = data.status
+				this.loadend = false;
+				this.$set(this.sotreParam, 'page', 1)
+				this.storeList = [];
+				this.storeMerchantList();
+			},
+			// 组件关闭
+			close() {
+				this.rightBox = false
+				this.show = false
+			},
+			//点击事件处理
+			set_where: function(e) {
+				if (this.loading) return
+				this.storeList = []
+				this.firstKey = e
+				this.sotreParam.page = 1
+				this.sotreParam.order = this.downMenu[e].order
+				this.storeMerchantList();
+			},
+			backjJump() {
+				uni.navigateBack({
+					delta: 1
+				})
+			},
+			// 滚动监听
+			onPageScroll(e) {
+				// 传入scrollTop值并触发所有easy-loadimage组件下的滚动监听事件
+				uni.$emit('scroll');
+			},
+			qctail(item) {
+				// console.log(item);
+				if (item.mer_certificate == '') {
+					return
+				}
+				this.show = true
+				this.image = item.mer_certificate[0]
+				// console.log(this.show);
+			},
+		},
+		//刷新
+		onPullDownRefresh() {
+			uni.stopPullDownRefresh()
+		},
+		//上划加载更多
+		onReachBottom() {
+			if (this.count === this.storeList.length) {
+				if (this.count === 0) {
+					return
+				}
+				uni.showToast({
+					title: '已加载全部',
+					icon: 'none',
+					duration: 1000
+				});
+			} else {
+				this.sotreParam.page += 1
+				this.storeMerchantList()
+			}
+		}
+
+	}
+</script>
+
+<style lang="scss" scoped>
+	* {
+		margin: 0;
+		padding: 0;
+	}
+
+	.com_name {
+		font-size: 32rpx;
+		// background-color: red;
+
+		white-space: nowrap;
+		/* 防止文字换行 */
+		overflow: hidden;
+		/* 超出部分隐藏 */
+		text-overflow: ellipsis;
+		max-width: 45vw;
+		/* 使用省略号表示溢出的内容 */
+
+		/* 可根据实际情况调整容器宽度 */
+	}
+
+	.serch_cls {
+		// padding-right: 200rpx;
+	}
+
+	.productList {
+		// padding-top: 50rpx;
+		// padding: 0 20rpx 0;
+
+		.top {
+			padding-top: var(--status-bar-height);
+			/* #ifdef H5 */
+			padding-top: 30rpx;
+			/* #endif */
+			background-color: #F0F2F5;
+			position: fixed;
+			z-index: 999;
+			width: 100%;
+			top: 0;
+		}
+
+		.content {
+			padding: 20rpx;
+		}
+
+		.menu_cls {
+			background-color: white;
+			// height: 199.77rpx;
+			border-radius: 21.03rpx 21.03rpx 21.03rpx 21.03rpx;
+			padding: 20rpx;
+
+			.menu_li {
+				margin-right: 50rpx;
+				// background-color: red;
+				width: 50vw;
+				// width: 120rpx;
+				// display: inline-block;
+			}
+
+
+		}
+
+		.head_tit {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			box-sizing: border-box;
+			padding: 0 20rpx;
+		}
+
+		.goods_list {
+			margin-top: 20rpx;
+
+			.goods_card {
+				margin-top: 20rpx;
+				height: auto;
+				background-color: white;
+				padding: 20rpx;
+				border-radius: 20rpx;
+				display: flex;
+				// align-items: center;
+
+				.left {
+					margin-right: 20rpx;
+					width: 158rpx;
+					height: 158rpx;
+					border-radius: 20rpx;
+					overflow: hidden;
+				}
+
+				.right {
+					.head {
+						font-weight: bold;
+						// color: red;
+
+					}
+
+					.li {
+						display: flex;
+						font-size: 26.29rpx;
+						margin-bottom: 10rpx;
+						align-items: center;
+
+						text {
+							margin: 0 20rpx 0 5rpx;
+						}
+					}
+				}
+			}
+		}
+
+		.address {
+			white-space: nowrap;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			width: 200px;
+		}
+
+
+	}
+
+
+	.search-right.styleType2 .right-text,
+	.search-right.styleType3 .right-text {
+		color: #282828;
+	}
+
+	.search-right.styleType2 .icon-xiangyou,
+	.search-right.styleType3 .icon-xiangyou {
+		color: #999999;
+	}
+
+	.search-right.styleType2 .icon-dingwei,
+	.search-right.styleType3 .icon-dingwei {
+		color: #8A8A8A;
+	}
+
+	.productList .search .back {
+		display: flex;
+		align-items: center;
+		width: 40rpx;
+		height: 60rpx;
+
+		.iconfont {
+			color: #fff;
+			font-size: 36rpx;
+		}
+	}
+
+	.hot_serch {
+		color: #B3B3B3;
+		display: flex;
+		justify-content: space-around;
+		margin: 20rpx 0;
+		flex-wrap: wrap;
+		// margin-top: 50rpx;
+		padding-top: 50rpx;
+		/* #ifdef H5 */
+		padding-top: 100rpx;
+		/* #endif */
+
+		text {
+			margin: 10rpx;
+		}
+	}
+
+	.productList .search .input {
+		flex: 1;
+		height: 60rpx;
+		background-color: #fff;
+		border-radius: 50rpx;
+		padding: 0 20rpx;
+		box-sizing: border-box;
+	}
+
+	.productList .search.styleType2 .input,
+	.productList .search.styleType3 .input {
+		background: #EDEDED;
+	}
+
+	.productList .search .input input {
+		flex: 1;
+		height: 100%;
+		font-size: 26rpx;
+		margin-left: 10rpx;
+	}
+
+	.productList .search .input .placeholder {
+		color: #999;
+	}
+
+	.productList .search .input .iconfont {
+		font-size: 35rpx;
+		color: #555;
+	}
+
+	.productList .search .icon-pailie,
+	.productList .search .icon-tupianpailie {
+		color: #fff;
+		width: 62rpx;
+		font-size: 40rpx;
+		height: 86rpx;
+		line-height: 86rpx;
+	}
+
+	.productList .nav-wrapper {
+		z-index: 9;
+		position: fixed;
+		left: 0;
+		top: 25px;
+		width: 100%;
+		margin-top: 86rpx;
+		background-color: #fff;
+
+		&.styleType1 {
+			background-color: var(--view-theme);
+		}
+
+		.tab-bar {
+			display: flex;
+			align-items: center;
+
+			.tab-item {
+				position: relative;
+				flex: 1;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				padding: 8rpx 0 20rpx;
+				color: #fff;
+				font-size: 28rpx;
+				font-weight: bold;
+
+				&::after {
+					content: ' ';
+					position: absolute;
+					left: 50%;
+					bottom: 18rpx;
+					width: 30rpx;
+					height: 3rpx;
+					background: transparent;
+					transform: translateX(-50%);
+				}
+
+				&.on {
+					&::after {
+						background: #fff;
+					}
+				}
+			}
+		}
+	}
+
+	.border-picture {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		background: center/cover no-repeat;
+	}
+
+	.productList .nav {
+		height: 86rpx;
+		color: #454545;
+		font-size: 28rpx;
+		display: flex;
+		justify-content: space-between;
+		padding: 0 28rpx;
+	}
+
+	.productList .nav .item {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-direction: column;
+		color: #FFFFFF;
+		flex: 1;
+	}
+
+	.productList .nav.styleType2 .item,
+	.productList .nav.styleType3 .item {
+		color: #282828;
+	}
+
+	.productList .nav .item.font-colors {
+		font-weight: 500;
+		color: #FFFFFF;
+	}
+
+	.productList .nav.styleType2 .item.font-colors,
+	.productList .nav.styleType3 .item.font-colors {
+		color: var(--view-theme);
+	}
+
+	.productList .nav .item .font-line {
+		height: 4rpx;
+		background-color: #fff;
+		margin-top: 3rpx;
+		width: 28rpx;
+		animation: line 0.3s;
+		-moz-animation: line 0.3s;
+		/* Firefox */
+		-webkit-animation: line 0.3s;
+		/* Safari 和 Chrome */
+		-o-animation: line 0.3s;
+		/* Opera */
+	}
+
+	.productList .nav.styleType2 .item .font-line,
+	.productList .nav.styleType3 .item .font-line {
+		background-color: var(--view-theme);
+	}
+
+	@keyframes line {
+		from {
+			width: 0rpx;
+		}
+
+		to {
+			width: 28rpx;
+		}
+	}
+
+	.productList .nav .item image {
+		width: 15rpx;
+		height: 19rpx;
+		margin-left: 10rpx;
+	}
+
+	.store-wrapper {
+		margin-top: 235rpx;
+		border-top: 1px solid #F6F6F6;
+
+		.store-item {
+			margin: 20rpx auto;
+
+			.head {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				color: #fff;
+
+				.zhezhao {
+					position: absolute;
+					width: 95%;
+					height: 150px;
+					border-radius: 20rpx;
+					z-index: 0;
+					opacity: 0.5;
+					background-color: #999;
+				}
+
+				.bgc_img {
+					position: absolute;
+					width: 95%;
+					height: 150px;
+					background-size: cover;
+					border-radius: 20rpx;
+					z-index: 0;
+				}
+
+				.zhezhao1 {
+					width: 100%;
+					height: 150px;
+					border-radius: 20rpx;
+					z-index: 1;
+
+					.title {
+						display: flex;
+						height: 50px;
+						align-items: center;
+						margin-left: 20px;
+						z-index: 1;
+
+						span {
+							background-color: #F84221;
+							color: white;
+							font-size: 12px;
+							padding: 3px;
+							border-radius: 5px;
+							margin-left: 5px;
+						}
+					}
+
+					.coent {
+						display: flex;
+						margin-left: 20px;
+
+						.avater {
+							width: 60px;
+							height: 80px;
+
+							image {
+								width: 60px;
+								height: 80px;
+							}
+						}
+
+						.text {
+							.text_one {
+								display: flex;
+								height: 30px;
+								line-height: 30px;
+								padding-left: 10px;
+
+								image {
+									width: 20px;
+									height: 20px;
+									margin-right: 10px;
+								}
+
+								.text_one_r {
+									margin-left: 10px;
+								}
+							}
+
+							.text_two {
+								width: 270px;
+								height: 30px;
+								line-height: 30px;
+								padding-left: 10px;
+								white-space: nowrap;
+								overflow: hidden;
+								text-overflow: ellipsis;
+
+								image {
+									width: 20px;
+									height: 20px;
+									margin-right: 10px;
+								}
+							}
+
+							.text_three {
+								width: 270px;
+								height: 30px;
+								line-height: 30px;
+								padding-left: 10px;
+								white-space: nowrap;
+								overflow: hidden;
+								text-overflow: ellipsis;
+
+								image {
+									width: 20px;
+									height: 20px;
+									margin-right: 10px;
+								}
+							}
+						}
+
+					}
+				}
+
+
+			}
+
+			.pro-box {
+				white-space: nowrap;
+				display: flex;
+				align-items: center;
+				padding: 20rpx 20rpx 30rpx;
+
+				.pro-item {
+					display: inline-block;
+					width: 218rpx;
+					margin-right: 14rpx;
+
+					.picture,
+					/deep/image,
+					uni-image {
+						width: 100%;
+						height: 214rpx;
+						border-radius: 8rpx;
+						position: relative;
+					}
+
+					.price {
+						margin-top: 5rpx;
+						font-size: 28rpx;
+						color: var(--view-priceColor);
+						font-weight: bold;
+
+						text {
+							font-size: 28rpx;
+						}
+					}
+
+					&:last-child {
+						margin-right: 0;
+					}
+				}
+
+				&.styleType3 {
+					padding: 20rpx;
+
+					.pro-item {
+						display: inline-block;
+						background-color: #fff;
+						border-radius: 16rpx;
+						text-align: center;
+						padding: 10rpx 0 20rpx;
+
+						.picture,
+						/deep/image,
+						uni-image {
+							width: 194rpx;
+							height: 194rpx;
+							text-align: center;
+							border-radius: 8rpx;
+							position: relative;
+							margin: 0 auto;
+						}
+					}
+				}
+			}
+		}
+	}
+
+	.mer-item2 {
+		padding: 20rpx;
+		background: #fff;
+		margin-bottom: 20rpx;
+		border-radius: 16rpx;
+
+		.mer-shop-count {
+			display: flex;
+
+			.mer-avatar {
+				width: 100rpx;
+				height: 100rpx;
+			}
+
+			.mer-top {
+				color: #282828;
+			}
+
+			.mer-shop-right {
+				margin-left: 20rpx;
+
+				.mer-btn {
+					color: #666666;
+				}
+
+			}
+
+			.pro-box {
+				white-space: nowrap;
+				display: flex;
+				align-items: center;
+				margin-top: 20rpx;
+
+				.pro-item {
+					display: inline-block;
+					width: 170rpx;
+					margin-right: 20rpx;
+
+					.picture,
+					/deep/image,
+					uni-image,
+					/deep/.easy-loadimage {
+						width: 100%;
+						height: 170rpx;
+						border-radius: 8rpx;
+						position: relative;
+					}
+
+					.price {
+						margin-top: 5rpx;
+						font-size: 28rpx;
+						color: var(--view-priceColor);
+						font-weight: bold;
+
+						text {
+							font-size: 28rpx;
+						}
+					}
+
+					&:last-child {
+						margin-right: 0;
+					}
+				}
+			}
+		}
+
+	}
+
+	.no-shop {
+		background-color: #fff;
+		// padding-bottom: calc(100% - 176rpx);
+
+		.pictrue {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			color: $uni-nothing-text;
+
+			image {
+				width: 414rpx;
+				height: 380rpx;
+			}
+		}
+	}
+
+	.guanbi {
+		width: 20px;
+		height: 20px;
+		margin: 30px auto;
+	}
+
+	.pop {
+		z-index: 1;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/nongKe/specialty/index.vue b/pages/nongKe/specialty/index.vue
index 196a2d3..afb437f 100644
--- a/pages/nongKe/specialty/index.vue
+++ b/pages/nongKe/specialty/index.vue
@@ -1,142 +1,271 @@
 <template>
-	<view class="box">
-		<view class="head">
-			<view style="height: var(--status-bar-height);"></view>
-			<!-- <u--image style="position: absolute;" :showLoading="true" src="/static/images/MYTC/BG.png" width="750rpx"
-				height="748.25rpx" @click="click"></u--image> -->
-			<view class="head_tit">
-				<view class="head_tit_l">
-					<view class="iconfont icon-xiangzuo"></view>
-					<view
-						style="font-size: 40rpx;font-weight: 700;margin-left: 30rpx; transform: skewX(-10deg);color:white;">
-						名优特产
-					</view>
+	<view style="background-color: #F0F2F5;min-height: 100vh">
+		<view style="height: var(--status-bar-height);"></view>
+		<view class='productList' :style="viewColor">
+			<!-- 顶部 -->
+			<view class="top">
+				<view style="height: 10px;">
 				</view>
-				<view class="head_tit_r" style="font-size: 29.79rpx;">
-					江阳区 <text style="margin-left: 10rpx;" class="iconfont icon-xiangxia"></text>
-					<view class="" style="font-size: 22.78rpx;">
-						晴天30℃
+				<view class="head_tit">
+					<view class="" style="display: flex;align-items: center;">
+						<view class="back" @click='backjJump()' style="margin-right: 17rpx;">
+							<view class="iconfont icon-xiangzuo" style="color: #333333;"></view>
+						</view>
+						<view style="font-size: 40rpx;font-weight: 700;transform: skewX(-10deg);">
+							<!-- {{titName}} -->
+							名优特产
+						</view>
 					</view>
+					<view class="">
+
+					</view>
+
+					<view style="position: relative;">
+						<!-- <text class='iconfont icon-sousuo'></text>
+			<input placeholder='搜索店铺名称' placeholder-class='placeholder' confirm-type='search' name="search"
+				:value='sotreParam.keyword' @confirm="searchSubmit"></input> -->
+						<u-search borderColor="#FF6D20" bgColor="white" :showAction="false" placeholder="搜索店铺名称"
+							v-model="sotreParam.keyword" class="serch_cls"></u-search>
+						<u--image @tap="searchSubmit" class="img_cls" style="position: absolute; top: 3px;right: 3px;"
+							:showLoading="true" src="/static/images/GXSC/SS.png" width="115.65rpx"
+							height="56.82rpx"></u--image>
+					</view>
+
 				</view>
 			</view>
-
-			<view class="head_serch">
-				<view style="position: relative;">
-					<!-- 	<u-search borderColor="#FF6D20" bgColor="white" :showAction="false" placeholder="搜索店铺名称"
-						v-model="keyword" class="serch_cls"></u-search> -->
-					<!-- 	<u--image class="img_cls" style="position: absolute; top: 3px;right: 3px;" :showLoading="true"
-						src="/static/images/MYTC/SS.png" width="115.65rpx" height="56.82rpx"></u--image> -->
+			<view class="content">
+				<view class="hot_serch">
+					<!-- <text>热搜:</text> <text>热a搜商品</text> <text>热搜商品</text>
+					<text>热搜sasas商品</text> -->
 				</view>
-			</view>
-
-			<view class="head_content">
-				<view style="font-size: 40rpx;font-weight: 700;color:white; margin-bottom: 10rpx;">
-					精选特产
-				</view>
-				<view class="head_content_card">
 
+				<!-- <view class="menu_cls">
 					<u-scroll-list>
-						<view v-for="(item, index) in list" :key="index" class="goods_card">
-							<u--image :showLoading="true" src="https://cdn.uviewui.com/uview/album/1.jpg"
-								width="210.28rpx" height="210.28rpx"></u--image>
-							<view class="goods_tit">
-								笑口常开地方就是的开发建设的开发建设的,v空间和客户可怜见立刻就
-							</view>
-							<view class="goods_price">
-								￥ 10.00
-							</view>
-
-							<!-- <image :src="item.thumb"></image> -->
+						<view class="menu_li" @click="navGo(item.merchant_category_id)" v-for="item,index in menuList"
+							:key="index">
+							<u--image :showLoading="true" :src="imgList[index]" width="94.63rpx" height="99.63rpx"
+								style="margin-bottom: 20rpx;"></u--image>
+							<text style="display: block;    width: 15vw;">{{item.category_name}}</text>
 						</view>
 					</u-scroll-list>
+				</view> -->
+
+				<view class="goods_list">
+					<view class="goods_card" @click="goStore(item.mer_id)" v-for="(item,index) in storeList"
+						:key="index">
+						<view class="left">
+							<u--image :showLoading="true" :src="item.mer_avatar" width="157.71rpx"
+								height="157.71rpx"></u--image>
+						</view>
+						<view class="right">
+							<view class="li head" style="display: flex;">
+								<text class="com_name">{{item.mer_name}}</text>
+								<text
+									style="font-weight: normal; font-size: 10rpx;color: red;padding:0 10rpx; border-radius: 10rpx; border: 1px solid red;">{{item.type_name}}</text>
+							</view>
+							<view class="li">
+								<u--image v-for="item,index in [1,1,,1,1,1]" :key="index" :showLoading="true"
+									src="/static/images/GXSC/PF.png" width="20.85rpx" height="19.85rpx"></u--image>
+								<text style="margin-left: 20rpx;color: #FF6D20; ">5.0</text>
+								<text>月销2000+</text>
+							</view>
+							<view class="li" style="align-items: center;">
+								<u--image :showLoading="true" src="/static/images/GXSC/DH.png" width="33.85rpx"
+									height="33.85rpx"></u--image>
+								<text> {{item.service_phone}}</text>
+							</view>
+							<view class="li" style="align-items: center;">
+								<u--image :showLoading="true" src="/static/images/GXSC/SJ.png" width="33.85rpx"
+									height="33.85rpx"></u--image>
+								<text>{{item.mer_take_time[0]}}-{{item.mer_take_time[1]}}</text>
+							</view>
+							<view class="li" style="align-items: center;">
+								<u--image :showLoading="true" src="/static/images/GXSC/DW.png" width="33.85rpx"
+									height="33.85rpx"></u--image>
+								<text class="address">{{item.mer_address}}</text>
+							</view>
+						</view>
+
+					</view>
 
 				</view>
+
+
 			</view>
-		</view>
 
-		<view class="store" style="background-color: white;">
-			<view class="goods_list">
-				<view class="goods_cards" @click="goStore(item.mer_id)" v-for="(item,index) in storeList" :key="index">
-					<view class="left">
-						<u--image :showLoading="true" :src="item.mer_avatar" width="157.71rpx"
-							height="157.71rpx"></u--image>
-					</view>
-					<view class="right">
-						<view class="li heads" style="display: flex;">
-							<text class="flag">特产</text>
-							<text class="com_name">{{item.mer_name}}</text>
-							<text
-								style="font-weight: normal; font-size: 10rpx;color: #737373;padding:0 10rpx; border-radius: 10rpx; border: 1px solid #737373;">{{item.type_name}}</text>
-						</view>
-						<view class="li">
-							<u--image v-for="item,index in [1,1,,1,1,1]" :key="index" :showLoading="true"
-								src="/static/images/GXSC/PF.png" width="20.85rpx" height="19.85rpx"></u--image>
-							<text style="margin-left: 10rpx;color: #FF6D20; ">5.0</text>
-							<text>月销2000+</text>
-							<text>20分钟</text>
-							<text>1.1km</text>
-						</view>
-						<view class="li" style="align-items: center;">
-							<u--image :showLoading="true" src="/static/images/GXSC/DH.png" width="33.85rpx"
-								height="33.85rpx"></u--image>
-							<text> {{item.service_phone}}</text>
-						</view>
-						<view class="li" style="align-items: center;">
-							<u--image :showLoading="true" src="/static/images/GXSC/SJ.png" width="33.85rpx"
-								height="33.85rpx"></u--image>
-							<text>{{item.mer_take_time[0]}}-{{item.mer_take_time[1]}}</text>
-						</view>
-						<view class="li" style="align-items: center;">
-							<u--image :showLoading="true" src="/static/images/GXSC/DW.png" width="33.85rpx"
-								height="33.85rpx"></u--image>
-							<text class="address">{{item.mer_address}}</text>
-						</view>
+			<!-- 热搜 -->
 
+
+
+			<!-- <view class="nav-wrapper" :class="'styleType'+store_street_theme">
+				<view class='nav acea-row row-middle' :class="'styleType'+store_street_theme">
+					<view v-for="item in downMenus" :key="item.key" class='item'
+						:class="{'font-colors':firstKey == item.key}" @click='set_where(item.key)'>
 						<view class="">
-							<u-scroll-list>
-								<view v-for="(item, index) in list" :key="index" style="margin-right: 20rpx;">
-									<u--image :showLoading="true" src="https://cdn.uviewui.com/uview/album/1.jpg"
-										width="164.72rpx" height="164.72rpx"></u--image>
-									<view class="goods_tit_a">
-										笑口常开地方就是的开发建设的开发建设的,v空间和客户可怜见立刻就
-									</view>
-									<view style="color: red;">
-										$10.00
-									</view>
-
-									<!-- <image :src="item.thumb"></image> -->
-								</view>
-								<!-- <view v-for="(item, index) in list" :key="index">
-									<image :src="item.thumb"></image>
-								</view> -->
-							</u-scroll-list>
+							{{item.title}}
 						</view>
-						<!-- <view class="">
-							<u-scroll-list>
-								<view v-for="(item, index) in list" :key="index" class="goods_card_a">
-									<u--image :showLoading="true" src="https://cdn.uviewui.com/uview/album/1.jpg"
-										width="164.72rpx" height="164.72rpx" @click="click"></u--image>
-									<view class="goods_tit_a">
-										笑口常开地方就是的开发建设的开发建设的,v空间和客户可怜见立刻就
-									</view>
-									<view class="goods_price">
-										$10.00
-									</view>
-								</view>
-							</u-scroll-list>
+						<view class="line" :class="{'font-line':firstKey == item.key}">
 						</view>
- -->
-
-
 					</view>
 
 				</view>
-
 			</view>
+			
+			 -->
 
+			<!-- 店铺 -->
+			<!-- 
+			<block>
+				<view class="store-wrapper">
+					<view class="store-item" v-for="(item,index) in storeList" :key="index">
+						<view class="head">
+							<view class="bgc_img" :style="{ backgroundImage: `url(${item.mini_banner})`}">
+							</view>
+							<view class="zhezhao">
+							</view>
+							<view class="zhezhao1" @click="goStore(item.mer_id)">
+								<view class="title">
+									<view>{{item.mer_name}}
+									</view>
+									<span>
+										{{item.type_name}}
+									</span>
+								</view>
+								<view class="coent">
+									<view class="avater">
+										<image :src="item.mer_avatar" mode=""></image>
+									</view>
+									<view class=" text">
+										<view class="text_one">
+											<view class="">
+												<image src="@/static/images/phone.png" mode=""></image>
+												{{item.service_phone}}
+											</view>
+											<view class="text_one_r">
+												<image src="@/static/images/clock.png" mode=""></image>
+												{{item.mer_take_time[0]}}-{{item.mer_take_time[1]}}
+											</view>
+										</view>
+										<view class="text_two">
+											<image src="@/static/images/shangpu.png" mode=""></image>
+											{{item.mer_info}}
+										</view>
+										<view class="text_three">
+											<image src="@/static/images/dingwei.png" mode=""></image>
+											{{item.mer_address}}
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</block>
+			<block v-if="store_street_theme == 2">
+				<view class="mer-item2" v-for="(item,index) in storeList" :key='index'>
+					<view class="mer-hd mer-shop-count" @click="goStore(item.mer_id)">
+						<image class="mer-avatar" :src="item.mer_avatar"></image>
+						<view class="mer-shop-right">
+							<view class="mer-count">
+								<view class="mer-top">
+									<view class="txt line1">{{item.mer_name}}</view>
+									<text v-if="item.type_name" class="font-bg-red ml8">{{item.type_name}}</text>
+									<text v-else-if="item.is_trader" class="font-bg-red ml8">自营</text>
+								</view>
+								<view class="mer-btn">
+									<view class="">
+										{{item.care_count<10000 ? item.care_count : (item.care_count/10000).toFixed(2)+'万'}}人关注
+									</view>
+									<view class="line" v-if="item.distance"></view>
+									<view class="distance" v-if="item.distance" @click.stop="showStoreLocation(item)">
+										<view class="">
+											{{item.distance}}
+										</view>
+										<view class="iconfont icon-xiangyou"></view>
+									</view>
+								</view>
+							</view>
+							<view class="pro-box">
+								<navigator :url="`/pages/goods_details/index?id=${itemn.product_id}`" hover-class="none"
+									class="pro-item" v-for="(itemn,indexn) in item.recommend" :key='indexn'>
+									<view class="picture">
+										<easy-loadimage mode="widthFix" :image-src="itemn.image"></easy-loadimage>
+										<view v-if="itemn.border_pic"
+											:style="{ backgroundImage: `url(${itemn.border_pic})` }"
+											class="border-picture"></view>
+									</view>
+									<view class="price">
+										<text>￥</text>{{itemn.price}}
+									</view>
+								</navigator>
+							</view>
+						</view>
+					</view>
+				</view>
+			</block>
+			<block v-if="store_street_theme == 3">
+				<view class="mer-item mer-item3" v-for="(item,index) in storeList" :key='index'
+					:style="'background-image:url('+item.mini_banner+')'">
+					<view class="mer-hd" @click="goStore(item.mer_id)">
+						<view class="mer-name">
+							<image :src="item.mer_avatar"></image>
+							<view class="">
+								<view class="mer-top">
+									<view class="txt line1">{{item.mer_name}}</view>
+									<text v-if="item.type_name" class="font-bg-red ml8">{{item.type_name}}</text>
+									<text v-else-if="item.is_trader" class="font-bg-red ml8">自营</text>
+								</view>
+								<view class="mer-btn">
+									<view class="">
+										{{item.care_count<10000 ? item.care_count : (item.care_count/10000).toFixed(2)+'万'}}人关注
+									</view>
+									<view class="line" v-if="item.distance"></view>
+									<view class="distance" v-if="item.distance" @click.stop="showStoreLocation(item)">
+										<view class="">
+											{{item.distance}}
+										</view>
+										<view class="iconfont icon-xiangyou"></view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="pro-box" :class="'styleType'+store_street_theme">
+						<view class="pro-item" v-for="(itemn,indexn) in item.recommend" :key='indexn' v-if="indexn<=2">
+							<view @click="go_details(itemn.product_type,itemn.product_id)">
+								<view class="picture">
+									<image :src="itemn.image"></image>
+									<view v-if="itemn.border_pic"
+										:style="{ backgroundImage: `url(${itemn.border_pic})` }" class="border-picture">
+									</view>
+								</view>
+								<view class="price">
+									<text>￥</text>{{itemn.price}}
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</block>
+			<view class='loadingicon acea-row row-center-wrapper' v-if="loading">
+				<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
+			</view>
+		 -->
 
 
 		</view>
+		<view class='no-shop' v-if="!storeList.length && !loading && !loadingIcon" v-cloak>
+			<view class='pictrue' style="margin: 0 auto;background-color: #F0F2F5;">
+				<image src='../../../static/images/noCart.png'></image>
+				<text>暂无店铺，快去搜索其他店铺吧</text>
+			</view>
+		</view>
+		</block>
+		<u-popup class="pop" :show="show" @close="close" mode="center" bgColor='transparent'>
+			<image :src="image"></image>
+			<image src="@/static/images/guanbi.png" class="guanbi" @click="close"></image>
+		</u-popup>
+	</view>
 
 	</view>
 </template>
@@ -144,104 +273,498 @@
 <script>
 	import {
 		storeMerchantList,
+		getGeocoder,
+		supMenuApi,
+		supAgoodsApi
 	} from '@/api/store.js';
+
+	import {
+		merClassifly,
+		getStoreTypeApi
+	} from '@/api/store.js';
+	import {
+		mapGetters
+	} from "vuex";
+	import {
+		goShopDetail
+	} from '@/libs/order.js'
+	import {
+		configMap
+	} from '@/utils';
+	import easyLoadimage from '@/components/easy-loadimage/easy-loadimage.vue';
+	const app = getApp();
 	export default {
+		components: {
+			easyLoadimage
+		},
 		data() {
 			return {
-				keyword: "",
-				list: [1, 1, 1, 11, 1, 11, 11],
-				storeList: [1, 1, 1, 1, 1, 1, 1, 1, 1]
-			}
+
+				titName: "坝坝宴",
+				price: 0,
+				stock: 0,
+				nows: false,
+				loading: false,
+				loadingIcon: true,
+				loadTitle: '加载更多',
+				title: '',
+				hotPage: 1,
+				hotLimit: 10,
+				hotScroll: false,
+				// 筛选框
+				rightBox: false,
+				//品牌列表
+				brandList: [],
+				downKey: 0,
+				downStatus: false,
+				menuList: [],
+				// 下拉菜单
+				downMenu: [{
+						title: '默认',
+						key: 0,
+						order: ""
+					},
+					{
+						title: '销量',
+						key: 1,
+						order: 'sales'
+					},
+					{
+						title: '好评',
+						key: 2,
+						order: 'rate'
+					},
+					{
+						title: '距离',
+						key: 3,
+						order: 'location'
+					}
+				],
+				// 是否第一个
+				firstKey: 0,
+				// 商铺列表
+				storeList: [],
+				sotreParam: {
+					keyword: '',
+					page: 1,
+					limit: 10,
+					order: '',
+					category_id: '',
+					type_id: '',
+					street_id: '',
+					type_code: '',
+
+				},
+				storeKey: 0,
+				storeScroll: true,
+				mer_id: '',
+				sortId: '',
+				price_on: '',
+				price_off: '',
+				detaile_address: "",
+				recommend_address: "",
+				location_address: "",
+				latitude: "",
+				longitude: "",
+				count: 0,
+				storeTypeArr: [], //店铺类型
+				merList: [], //商户分类
+				product_type: 0,
+				show: false,
+				image: '', //图片,
+				credit_buy: '', //支持先货后款
+			};
 		},
-		onLaunch() {
-			console.log(46545)
-			// storeMerchantList().then(res => {
-			// 	// this.count = res.data.count
-			// 	// this.storeList = this.storeList.concat(res.data.list)
-			// 	// this.loading = false
-			// 	// this.loadingIcon = false
-			// 	console.log(res)
-			// })
+		onLoad(options) {
+			this.sotreParam.type_code = options.type_code
+			this.storeList = [];
+			if (this.mer_location == 1) {
+				this.selfLocation()
+			}
+			this.storeMerchantList();
+			this.getClassfication();
+			this.getStoreType();
+
+
 
 		},
-		onShow() {
-			// console.log(46545)
-			storeMerchantList().then(res => {
-				// this.count = res.data.count
-				this.storeList = res.data.list
-				// this.loading = false
-				// this.loadingIcon = false
-				// console.log(res)
-			})
+		computed: {
+			downMenus: function() {
+				return this.downMenu.filter((item) => {
+					if (this.mer_location) {
+						return item
+					} else {
+						return item.key < 3
+					}
+				})
+			},
+			...configMap({
+				margin_ico_switch: 0,
+				margin_ico: '',
+				mer_location: 0,
+				store_street_theme: 1,
+				hide_mer_status: '',
+			}, mapGetters(['viewColor'])),
 		},
-		methods: {},
+		methods: {
+			navGo(id) {
+				uni.navigateTo({
+					url: `/pages/nongKe/supply_chain/supplierA?type_id=10&?merchant_category_id=${id}`
+				})
+			},
+			go_details: function(product_type, product_id) {
+				if (product_type == 98) {
+					uni.navigateTo({
+						url: `/pages/admin/goods_details/index?product_id=${product_id}&product_type=${product_type}`
+					})
+				}
+				if (product_type == 0) {
+					uni.navigateTo({
+						url: `/pages/goods_details/index?id=${product_id}`
+					})
+				}
+			},
+			// 获取商户分类
+			getClassfication: function() {
+				let temp = []
+				merClassifly()
+					.then(res => {
+						temp = res.data.map(item => {
+							return {
+								...item,
+								check: false
+							}
+						})
+						if (this.sotreParam.category_id.length > 0) {
+							this.sotreParam.category_id.forEach((ids, index) => {
+								temp.forEach(el => {
+									if (ids == el.merchant_category_id) {
+										el.check = true
+									}
+								})
+							})
+						}
+						this.merList = temp
+					})
+					.catch(res => {
+						this.$util.Tips({
+							title: res
+						});
+					});
+			},
+			// 获取店铺类型
+			getStoreType: function() {
+				let temp = []
+				getStoreTypeApi().then(res => {
+						res.data.forEach(item => {
+							if (item.mer_type_id == this.sotreParam.type_id) {
+								temp.push({
+									...item,
+									check: true
+								})
+							}
+						})
+						this.storeTypeArr = temp
+					})
+					.catch(res => {
+						this.$util.Tips({
+							title: res
+						});
+					});
+			},
+			/** 打开地图**/
+			showMaoLocation(lat, long) {
+				if (!lat || !long) return this.$util.Tips({
+					title: '请设置允许商城访问您的位置！'
+				});
+				//#ifdef H5
+				if (this.$wechat.isWeixin() === true) {
+					this.$wechat.seeLocation({
+						latitude: Number(lat),
+						longitude: Number(long),
+						name: '当前位置',
+						address: this.location_address
+					}).then(res => {
+						// console.log('success');
+					})
+				} else {
+					//#endif
+					uni.openLocation({
+						latitude: parseFloat(lat),
+						longitude: parseFloat(long),
+						name: '当前位置',
+						address: this.location_address,
+						scale: 8,
+						success: function(res) {
+							// console.log(res)
+						},
+					});
+					// #ifdef H5
+				}
+				//#endif	
+			},
+			showStoreLocation(item) {
+				if (!item.lat || !item.long) return this.$util.Tips({
+					title: '请设置允许商城访问您的位置！'
+				});
+				//#ifdef H5
+				if (this.$wechat.isWeixin() === true) {
+					this.$wechat.seeLocation({
+						latitude: Number(item.lat),
+						longitude: Number(item.long),
+						name: item.mer_name,
+						address: item.mer_address ? item.mer_address : '',
+					}).then(res => {
+						// console.log('success');
+					})
+				} else {
+					//#endif
+					uni.openLocation({
+						latitude: parseFloat(item.lat),
+						longitude: parseFloat(item.long),
+						scale: 8,
+						name: item.mer_name,
+						address: item.mer_address ? item.mer_address : '',
+						success: function(res) {
+							// console.log(res)
+						},
+					});
+					// #ifdef H5
+				}
+				//#endif	
+			},
+			selfLocation() {
+				let self = this
+				uni.getLocation({
+					type: 'gcj02',
+					success: (res) => {
+						let latitude, longitude;
+						latitude = res.latitude.toString();
+						longitude = res.longitude.toString();
+						this.latitude = res.latitude
+						this.longitude = res.longitude
+						getGeocoder({
+							lat: latitude,
+							long: longitude
+						}).then(res => {
+							// console.log(res)
+							this.detaile_address = res.data.address;
+							this.location_address = res.data.address;
+							this.recommend_address = res.data.address.length > 4 ? res.data.address
+								.slice(0, 4) + '...' :
+								res.data.address
+						}).catch(err => {
+							uni.showToast({
+								title: err,
+								icon: 'none'
+							})
+						})
+					},
+					fail: (res) => {
+						uni.showToast({
+							title: res,
+							icon: 'none',
+							duration: 1000
+						});
+					},
+				});
+			},
+			// 查找店铺
+			storeMerchantList() {
+				if (this.loading) return
+				this.loading = true
+				let rqData = {
+					keyword: this.sotreParam.keyword,
+					page: this.sotreParam.page,
+					limit: 10,
+					type_code: this.sotreParam.type_code,
+				}
+				if (this.latitude) {
+					rqData.location = this.latitude + ',' + this.longitude
+				}
+				// console.log(rqData)
+				storeMerchantList(rqData).then(res => {
+					this.count = res.data.count
+					this.storeList = this.storeList.concat(res.data.list)
+					this.loading = false
+					this.loadingIcon = false
+					// this.titName = this.storeList[0].mer_info
+				})
+			},
+			// 进店
+			goStore(id) {
+				if (this.sotreParam.type_id == 12) {
+					uni.navigateTo({
+						url: `/pages/nongKe/supply_chain/merchant?id=${id}`
+					})
+				} else {
+					if (this.hide_mer_status != 1) {
+						uni.navigateTo({
+							url: `/pages/store/home/index?id=${id}&type=7`
+						})
+					}
+				}
+			},
+			searchSubmit: function() {
+				let that = this;
+				that.$set(that.sotreParam, 'keyword', this.sotreParam.keyword);
+				this.set_where(this.firstKey)
+			},
+			// 右侧切换
+			bindRight() {
+				this.sotreParam.page = 1
+				this.rightBox = true
+			},
+			// 组件确定
+			confirm(data) {
+				let arr1 = [],
+					arr2 = []
+				if (data.storeTypeArr.length == 0) {
+					// this.sotreParam.type_id = ''
+				} else {
+					data.storeTypeArr.forEach(item => {
+						arr1.push(item.mer_type_id)
+					})
+					this.sotreParam.type_id = arr1.toString();
+				}
+				if (data.merList.length == 0) {
+					this.sotreParam.category_id = ''
+				} else {
+					data.merList.forEach(item => {
+						arr2.push(item.merchant_category_id)
+					})
+					this.sotreParam.category_id = arr2.toString();
+				}
+				this.rightBox = data.status
+				this.loadend = false;
+				this.$set(this.sotreParam, 'page', 1)
+				this.storeList = [];
+				this.storeMerchantList();
+			},
+			// 组件关闭
+			close() {
+				this.rightBox = false
+				this.show = false
+			},
+			//点击事件处理
+			set_where: function(e) {
+				if (this.loading) return
+				this.storeList = []
+				this.firstKey = e
+				this.sotreParam.page = 1
+				this.sotreParam.order = this.downMenu[e].order
+				this.storeMerchantList();
+			},
+			backjJump() {
+				uni.navigateBack({
+					delta: 1
+				})
+			},
+			// 滚动监听
+			onPageScroll(e) {
+				// 传入scrollTop值并触发所有easy-loadimage组件下的滚动监听事件
+				uni.$emit('scroll');
+			},
+			qctail(item) {
+				// console.log(item);
+				if (item.mer_certificate == '') {
+					return
+				}
+				this.show = true
+				this.image = item.mer_certificate[0]
+				// console.log(this.show);
+			},
+		},
+		//刷新
 		onPullDownRefresh() {
 			uni.stopPullDownRefresh()
+		},
+		//上划加载更多
+		onReachBottom() {
+			if (this.count === this.storeList.length) {
+				if (this.count === 0) {
+					return
+				}
+				uni.showToast({
+					title: '已加载全部',
+					icon: 'none',
+					duration: 1000
+				});
+			} else {
+				this.sotreParam.page += 1
+				this.storeMerchantList()
+			}
 		}
+
 	}
 </script>
 
 <style lang="scss" scoped>
-	.head {
-		// background-color: #F94621;
-		background: url('/static/images/MYTC/BG.png') no-repeat;
-		padding: 20rpx;
-		border-radius: 0rpx 0rpx 31.54rpx 31.54rpx;
-
-		.head_tit {
-			display: flex;
-			justify-content: space-between;
-			color: white;
-			// margin-bottom: 20rpx;
-
-			.head_tit_l {
-				display: flex;
-				align-items: center;
-			}
-
-			.head_tit_r {
-				// display: flex;
-				// align-items: center;
-			}
-		}
-
-		.head_serch {
-			margin: 20rpx 0;
-		}
-
-		.head_content {
-			.head_content_card {
-				background: linear-gradient(to bottom, #FCB9AD, #FFFBF9, #FFFFFF);
-				border-radius: 21.03rpx 21.03rpx 21.03rpx 21.03rpx;
-				overflow: hidden;
-				padding: 20rpx 10rpx;
-
-				.goods_card {
-					margin-right: 20rpx;
-				}
-
-				.goods_tit {
-					overflow: hidden;
-					text-overflow: ellipsis;
-					display: -webkit-box;
-					-webkit-line-clamp: 2;
-					-webkit-box-orient: vertical;
-				}
-
-				.goods_price {
-					color: #F84221;
-					font-size: 29.79rpx;
-				}
-
-			}
-		}
+	* {
+		margin: 0;
+		padding: 0;
 	}
 
-	.store {
+	.com_name {
+		font-size: 32rpx;
+		// background-color: red;
+
+		white-space: nowrap;
+		/* 防止文字换行 */
+		overflow: hidden;
+		/* 超出部分隐藏 */
+		text-overflow: ellipsis;
+		max-width: 45vw;
+		/* 使用省略号表示溢出的内容 */
+
+		/* 可根据实际情况调整容器宽度 */
+	}
+
+	.serch_cls {
+		// padding-right: 200rpx;
+	}
+
+	.productList {
+		// padding-top: 50rpx;
+		// padding: 0 20rpx 0;
+
+		.top {
+			padding-top: var(--status-bar-height);
+			/* #ifdef H5 */
+			padding-top: 30rpx;
+			/* #endif */
+			background-color: #F0F2F5;
+			position: fixed;
+			z-index: 999;
+			width: 100%;
+			top: 0;
+		}
+
+		.content {
+			padding: 20rpx;
+		}
+
+		.menu_cls {
+			background-color: white;
+			// height: 199.77rpx;
+			border-radius: 21.03rpx 21.03rpx 21.03rpx 21.03rpx;
+			padding: 20rpx;
+
+			.menu_li {
+				margin-right: 50rpx;
+				// background-color: red;
+				width: 50vw;
+				// width: 120rpx;
+				// display: inline-block;
+			}
+
+
+		}
+
 		.goods_list {
 			margin-top: 20rpx;
 
-			.goods_cards {
+			.goods_card {
 				margin-top: 20rpx;
 				height: auto;
 				background-color: white;
@@ -254,58 +777,25 @@
 					margin-right: 20rpx;
 					width: 158rpx;
 					height: 158rpx;
-					// background-color: red;
 					border-radius: 20rpx;
 					overflow: hidden;
 				}
 
 				.right {
-					// box-sizing: border-box;
-					width: 75vw;
-					overflow: hidden;
-					// background-color: red;
-
-					.heads {
+					.head {
 						font-weight: bold;
+						// color: red;
 
-						.flag {
-							background: linear-gradient(to bottom, #F84221, #FF6D20);
-							width: 66.59rpx;
-							height: 36.8rpx;
-							text-align: center;
-							font-size: 22.78rpx;
-							color: white;
-							border-radius: 10.51rpx 10.51rpx 10.51rpx 10.51rpx;
-						}
-
-					}
-
-					.goods_card_a {
-						margin-right: 20rpx;
-					}
-
-					.goods_price_a {
-						color: #F84221;
-					}
-
-					.goods_tit_a {
-						overflow: hidden;
-						text-overflow: ellipsis;
-						display: -webkit-box;
-						-webkit-line-clamp: 1;
-						-webkit-box-orient: vertical;
 					}
 
 					.li {
 						display: flex;
 						font-size: 26.29rpx;
 						margin-bottom: 10rpx;
-
 						align-items: center;
-						color: #737373;
 
 						text {
-							margin: 0 10rpx 0;
+							margin: 0 20rpx 0 5rpx;
 						}
 					}
 				}
@@ -321,4 +811,504 @@
 
 
 	}
+
+
+	.search-right.styleType2 .right-text,
+	.search-right.styleType3 .right-text {
+		color: #282828;
+	}
+
+	.search-right.styleType2 .icon-xiangyou,
+	.search-right.styleType3 .icon-xiangyou {
+		color: #999999;
+	}
+
+	.search-right.styleType2 .icon-dingwei,
+	.search-right.styleType3 .icon-dingwei {
+		color: #8A8A8A;
+	}
+
+	.productList .search .back {
+		display: flex;
+		align-items: center;
+		width: 40rpx;
+		height: 60rpx;
+
+		.iconfont {
+			color: #fff;
+			font-size: 36rpx;
+		}
+	}
+
+	.head_tit {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		box-sizing: border-box;
+		padding: 0 20rpx;
+	}
+
+	.hot_serch {
+		color: #B3B3B3;
+		display: flex;
+		justify-content: space-around;
+		margin: 20rpx 0;
+		flex-wrap: wrap;
+		// margin-top: 50rpx;
+		padding-top: 50rpx;
+		/* #ifdef H5 */
+		padding-top: 100rpx;
+		/* #endif */
+
+		text {
+			margin: 10rpx;
+		}
+	}
+
+	.productList .search .input {
+		flex: 1;
+		height: 60rpx;
+		background-color: #fff;
+		border-radius: 50rpx;
+		padding: 0 20rpx;
+		box-sizing: border-box;
+	}
+
+	.productList .search.styleType2 .input,
+	.productList .search.styleType3 .input {
+		background: #EDEDED;
+	}
+
+	.productList .search .input input {
+		flex: 1;
+		height: 100%;
+		font-size: 26rpx;
+		margin-left: 10rpx;
+	}
+
+	.productList .search .input .placeholder {
+		color: #999;
+	}
+
+	.productList .search .input .iconfont {
+		font-size: 35rpx;
+		color: #555;
+	}
+
+	.productList .search .icon-pailie,
+	.productList .search .icon-tupianpailie {
+		color: #fff;
+		width: 62rpx;
+		font-size: 40rpx;
+		height: 86rpx;
+		line-height: 86rpx;
+	}
+
+	.productList .nav-wrapper {
+		z-index: 9;
+		position: fixed;
+		left: 0;
+		top: 25px;
+		width: 100%;
+		margin-top: 86rpx;
+		background-color: #fff;
+
+		&.styleType1 {
+			background-color: var(--view-theme);
+		}
+
+		.tab-bar {
+			display: flex;
+			align-items: center;
+
+			.tab-item {
+				position: relative;
+				flex: 1;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				padding: 8rpx 0 20rpx;
+				color: #fff;
+				font-size: 28rpx;
+				font-weight: bold;
+
+				&::after {
+					content: ' ';
+					position: absolute;
+					left: 50%;
+					bottom: 18rpx;
+					width: 30rpx;
+					height: 3rpx;
+					background: transparent;
+					transform: translateX(-50%);
+				}
+
+				&.on {
+					&::after {
+						background: #fff;
+					}
+				}
+			}
+		}
+	}
+
+	.border-picture {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		background: center/cover no-repeat;
+	}
+
+	.productList .nav {
+		height: 86rpx;
+		color: #454545;
+		font-size: 28rpx;
+		display: flex;
+		justify-content: space-between;
+		padding: 0 28rpx;
+	}
+
+	.productList .nav .item {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-direction: column;
+		color: #FFFFFF;
+		flex: 1;
+	}
+
+	.productList .nav.styleType2 .item,
+	.productList .nav.styleType3 .item {
+		color: #282828;
+	}
+
+	.productList .nav .item.font-colors {
+		font-weight: 500;
+		color: #FFFFFF;
+	}
+
+	.productList .nav.styleType2 .item.font-colors,
+	.productList .nav.styleType3 .item.font-colors {
+		color: var(--view-theme);
+	}
+
+	.productList .nav .item .font-line {
+		height: 4rpx;
+		background-color: #fff;
+		margin-top: 3rpx;
+		width: 28rpx;
+		animation: line 0.3s;
+		-moz-animation: line 0.3s;
+		/* Firefox */
+		-webkit-animation: line 0.3s;
+		/* Safari 和 Chrome */
+		-o-animation: line 0.3s;
+		/* Opera */
+	}
+
+	.productList .nav.styleType2 .item .font-line,
+	.productList .nav.styleType3 .item .font-line {
+		background-color: var(--view-theme);
+	}
+
+	@keyframes line {
+		from {
+			width: 0rpx;
+		}
+
+		to {
+			width: 28rpx;
+		}
+	}
+
+	.productList .nav .item image {
+		width: 15rpx;
+		height: 19rpx;
+		margin-left: 10rpx;
+	}
+
+	.store-wrapper {
+		margin-top: 235rpx;
+		border-top: 1px solid #F6F6F6;
+
+		.store-item {
+			margin: 20rpx auto;
+
+			.head {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				color: #fff;
+
+				.zhezhao {
+					position: absolute;
+					width: 95%;
+					height: 150px;
+					border-radius: 20rpx;
+					z-index: 0;
+					opacity: 0.5;
+					background-color: #999;
+				}
+
+				.bgc_img {
+					position: absolute;
+					width: 95%;
+					height: 150px;
+					background-size: cover;
+					border-radius: 20rpx;
+					z-index: 0;
+				}
+
+				.zhezhao1 {
+					width: 100%;
+					height: 150px;
+					border-radius: 20rpx;
+					z-index: 1;
+
+					.title {
+						display: flex;
+						height: 50px;
+						align-items: center;
+						margin-left: 20px;
+						z-index: 1;
+
+						span {
+							background-color: #F84221;
+							color: white;
+							font-size: 12px;
+							padding: 3px;
+							border-radius: 5px;
+							margin-left: 5px;
+						}
+					}
+
+					.coent {
+						display: flex;
+						margin-left: 20px;
+
+						.avater {
+							width: 60px;
+							height: 80px;
+
+							image {
+								width: 60px;
+								height: 80px;
+							}
+						}
+
+						.text {
+							.text_one {
+								display: flex;
+								height: 30px;
+								line-height: 30px;
+								padding-left: 10px;
+
+								image {
+									width: 20px;
+									height: 20px;
+									margin-right: 10px;
+								}
+
+								.text_one_r {
+									margin-left: 10px;
+								}
+							}
+
+							.text_two {
+								width: 270px;
+								height: 30px;
+								line-height: 30px;
+								padding-left: 10px;
+								white-space: nowrap;
+								overflow: hidden;
+								text-overflow: ellipsis;
+
+								image {
+									width: 20px;
+									height: 20px;
+									margin-right: 10px;
+								}
+							}
+
+							.text_three {
+								width: 270px;
+								height: 30px;
+								line-height: 30px;
+								padding-left: 10px;
+								white-space: nowrap;
+								overflow: hidden;
+								text-overflow: ellipsis;
+
+								image {
+									width: 20px;
+									height: 20px;
+									margin-right: 10px;
+								}
+							}
+						}
+
+					}
+				}
+
+
+			}
+
+			.pro-box {
+				white-space: nowrap;
+				display: flex;
+				align-items: center;
+				padding: 20rpx 20rpx 30rpx;
+
+				.pro-item {
+					display: inline-block;
+					width: 218rpx;
+					margin-right: 14rpx;
+
+					.picture,
+					/deep/image,
+					uni-image {
+						width: 100%;
+						height: 214rpx;
+						border-radius: 8rpx;
+						position: relative;
+					}
+
+					.price {
+						margin-top: 5rpx;
+						font-size: 28rpx;
+						color: var(--view-priceColor);
+						font-weight: bold;
+
+						text {
+							font-size: 28rpx;
+						}
+					}
+
+					&:last-child {
+						margin-right: 0;
+					}
+				}
+
+				&.styleType3 {
+					padding: 20rpx;
+
+					.pro-item {
+						display: inline-block;
+						background-color: #fff;
+						border-radius: 16rpx;
+						text-align: center;
+						padding: 10rpx 0 20rpx;
+
+						.picture,
+						/deep/image,
+						uni-image {
+							width: 194rpx;
+							height: 194rpx;
+							text-align: center;
+							border-radius: 8rpx;
+							position: relative;
+							margin: 0 auto;
+						}
+					}
+				}
+			}
+		}
+	}
+
+	.mer-item2 {
+		padding: 20rpx;
+		background: #fff;
+		margin-bottom: 20rpx;
+		border-radius: 16rpx;
+
+		.mer-shop-count {
+			display: flex;
+
+			.mer-avatar {
+				width: 100rpx;
+				height: 100rpx;
+			}
+
+			.mer-top {
+				color: #282828;
+			}
+
+			.mer-shop-right {
+				margin-left: 20rpx;
+
+				.mer-btn {
+					color: #666666;
+				}
+
+			}
+
+			.pro-box {
+				white-space: nowrap;
+				display: flex;
+				align-items: center;
+				margin-top: 20rpx;
+
+				.pro-item {
+					display: inline-block;
+					width: 170rpx;
+					margin-right: 20rpx;
+
+					.picture,
+					/deep/image,
+					uni-image,
+					/deep/.easy-loadimage {
+						width: 100%;
+						height: 170rpx;
+						border-radius: 8rpx;
+						position: relative;
+					}
+
+					.price {
+						margin-top: 5rpx;
+						font-size: 28rpx;
+						color: var(--view-priceColor);
+						font-weight: bold;
+
+						text {
+							font-size: 28rpx;
+						}
+					}
+
+					&:last-child {
+						margin-right: 0;
+					}
+				}
+			}
+		}
+
+	}
+
+	.no-shop {
+		background-color: #fff;
+		// padding-bottom: calc(100% - 176rpx);
+
+		.pictrue {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			color: $uni-nothing-text;
+
+			image {
+				width: 414rpx;
+				height: 380rpx;
+			}
+		}
+	}
+
+	.guanbi {
+		width: 20px;
+		height: 20px;
+		margin: 30px auto;
+	}
+
+	.pop {
+		z-index: 1;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/nongKe/specialty/indexa.vue b/pages/nongKe/specialty/indexa.vue
new file mode 100644
index 0000000..196a2d3
--- /dev/null
+++ b/pages/nongKe/specialty/indexa.vue
@@ -0,0 +1,324 @@
+<template>
+	<view class="box">
+		<view class="head">
+			<view style="height: var(--status-bar-height);"></view>
+			<!-- <u--image style="position: absolute;" :showLoading="true" src="/static/images/MYTC/BG.png" width="750rpx"
+				height="748.25rpx" @click="click"></u--image> -->
+			<view class="head_tit">
+				<view class="head_tit_l">
+					<view class="iconfont icon-xiangzuo"></view>
+					<view
+						style="font-size: 40rpx;font-weight: 700;margin-left: 30rpx; transform: skewX(-10deg);color:white;">
+						名优特产
+					</view>
+				</view>
+				<view class="head_tit_r" style="font-size: 29.79rpx;">
+					江阳区 <text style="margin-left: 10rpx;" class="iconfont icon-xiangxia"></text>
+					<view class="" style="font-size: 22.78rpx;">
+						晴天30℃
+					</view>
+				</view>
+			</view>
+
+			<view class="head_serch">
+				<view style="position: relative;">
+					<!-- 	<u-search borderColor="#FF6D20" bgColor="white" :showAction="false" placeholder="搜索店铺名称"
+						v-model="keyword" class="serch_cls"></u-search> -->
+					<!-- 	<u--image class="img_cls" style="position: absolute; top: 3px;right: 3px;" :showLoading="true"
+						src="/static/images/MYTC/SS.png" width="115.65rpx" height="56.82rpx"></u--image> -->
+				</view>
+			</view>
+
+			<view class="head_content">
+				<view style="font-size: 40rpx;font-weight: 700;color:white; margin-bottom: 10rpx;">
+					精选特产
+				</view>
+				<view class="head_content_card">
+
+					<u-scroll-list>
+						<view v-for="(item, index) in list" :key="index" class="goods_card">
+							<u--image :showLoading="true" src="https://cdn.uviewui.com/uview/album/1.jpg"
+								width="210.28rpx" height="210.28rpx"></u--image>
+							<view class="goods_tit">
+								笑口常开地方就是的开发建设的开发建设的,v空间和客户可怜见立刻就
+							</view>
+							<view class="goods_price">
+								￥ 10.00
+							</view>
+
+							<!-- <image :src="item.thumb"></image> -->
+						</view>
+					</u-scroll-list>
+
+				</view>
+			</view>
+		</view>
+
+		<view class="store" style="background-color: white;">
+			<view class="goods_list">
+				<view class="goods_cards" @click="goStore(item.mer_id)" v-for="(item,index) in storeList" :key="index">
+					<view class="left">
+						<u--image :showLoading="true" :src="item.mer_avatar" width="157.71rpx"
+							height="157.71rpx"></u--image>
+					</view>
+					<view class="right">
+						<view class="li heads" style="display: flex;">
+							<text class="flag">特产</text>
+							<text class="com_name">{{item.mer_name}}</text>
+							<text
+								style="font-weight: normal; font-size: 10rpx;color: #737373;padding:0 10rpx; border-radius: 10rpx; border: 1px solid #737373;">{{item.type_name}}</text>
+						</view>
+						<view class="li">
+							<u--image v-for="item,index in [1,1,,1,1,1]" :key="index" :showLoading="true"
+								src="/static/images/GXSC/PF.png" width="20.85rpx" height="19.85rpx"></u--image>
+							<text style="margin-left: 10rpx;color: #FF6D20; ">5.0</text>
+							<text>月销2000+</text>
+							<text>20分钟</text>
+							<text>1.1km</text>
+						</view>
+						<view class="li" style="align-items: center;">
+							<u--image :showLoading="true" src="/static/images/GXSC/DH.png" width="33.85rpx"
+								height="33.85rpx"></u--image>
+							<text> {{item.service_phone}}</text>
+						</view>
+						<view class="li" style="align-items: center;">
+							<u--image :showLoading="true" src="/static/images/GXSC/SJ.png" width="33.85rpx"
+								height="33.85rpx"></u--image>
+							<text>{{item.mer_take_time[0]}}-{{item.mer_take_time[1]}}</text>
+						</view>
+						<view class="li" style="align-items: center;">
+							<u--image :showLoading="true" src="/static/images/GXSC/DW.png" width="33.85rpx"
+								height="33.85rpx"></u--image>
+							<text class="address">{{item.mer_address}}</text>
+						</view>
+
+						<view class="">
+							<u-scroll-list>
+								<view v-for="(item, index) in list" :key="index" style="margin-right: 20rpx;">
+									<u--image :showLoading="true" src="https://cdn.uviewui.com/uview/album/1.jpg"
+										width="164.72rpx" height="164.72rpx"></u--image>
+									<view class="goods_tit_a">
+										笑口常开地方就是的开发建设的开发建设的,v空间和客户可怜见立刻就
+									</view>
+									<view style="color: red;">
+										$10.00
+									</view>
+
+									<!-- <image :src="item.thumb"></image> -->
+								</view>
+								<!-- <view v-for="(item, index) in list" :key="index">
+									<image :src="item.thumb"></image>
+								</view> -->
+							</u-scroll-list>
+						</view>
+						<!-- <view class="">
+							<u-scroll-list>
+								<view v-for="(item, index) in list" :key="index" class="goods_card_a">
+									<u--image :showLoading="true" src="https://cdn.uviewui.com/uview/album/1.jpg"
+										width="164.72rpx" height="164.72rpx" @click="click"></u--image>
+									<view class="goods_tit_a">
+										笑口常开地方就是的开发建设的开发建设的,v空间和客户可怜见立刻就
+									</view>
+									<view class="goods_price">
+										$10.00
+									</view>
+								</view>
+							</u-scroll-list>
+						</view>
+ -->
+
+
+					</view>
+
+				</view>
+
+			</view>
+
+
+
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import {
+		storeMerchantList,
+	} from '@/api/store.js';
+	export default {
+		data() {
+			return {
+				keyword: "",
+				list: [1, 1, 1, 11, 1, 11, 11],
+				storeList: [1, 1, 1, 1, 1, 1, 1, 1, 1]
+			}
+		},
+		onLaunch() {
+			console.log(46545)
+			// storeMerchantList().then(res => {
+			// 	// this.count = res.data.count
+			// 	// this.storeList = this.storeList.concat(res.data.list)
+			// 	// this.loading = false
+			// 	// this.loadingIcon = false
+			// 	console.log(res)
+			// })
+
+		},
+		onShow() {
+			// console.log(46545)
+			storeMerchantList().then(res => {
+				// this.count = res.data.count
+				this.storeList = res.data.list
+				// this.loading = false
+				// this.loadingIcon = false
+				// console.log(res)
+			})
+		},
+		methods: {},
+		onPullDownRefresh() {
+			uni.stopPullDownRefresh()
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.head {
+		// background-color: #F94621;
+		background: url('/static/images/MYTC/BG.png') no-repeat;
+		padding: 20rpx;
+		border-radius: 0rpx 0rpx 31.54rpx 31.54rpx;
+
+		.head_tit {
+			display: flex;
+			justify-content: space-between;
+			color: white;
+			// margin-bottom: 20rpx;
+
+			.head_tit_l {
+				display: flex;
+				align-items: center;
+			}
+
+			.head_tit_r {
+				// display: flex;
+				// align-items: center;
+			}
+		}
+
+		.head_serch {
+			margin: 20rpx 0;
+		}
+
+		.head_content {
+			.head_content_card {
+				background: linear-gradient(to bottom, #FCB9AD, #FFFBF9, #FFFFFF);
+				border-radius: 21.03rpx 21.03rpx 21.03rpx 21.03rpx;
+				overflow: hidden;
+				padding: 20rpx 10rpx;
+
+				.goods_card {
+					margin-right: 20rpx;
+				}
+
+				.goods_tit {
+					overflow: hidden;
+					text-overflow: ellipsis;
+					display: -webkit-box;
+					-webkit-line-clamp: 2;
+					-webkit-box-orient: vertical;
+				}
+
+				.goods_price {
+					color: #F84221;
+					font-size: 29.79rpx;
+				}
+
+			}
+		}
+	}
+
+	.store {
+		.goods_list {
+			margin-top: 20rpx;
+
+			.goods_cards {
+				margin-top: 20rpx;
+				height: auto;
+				background-color: white;
+				padding: 20rpx;
+				border-radius: 20rpx;
+				display: flex;
+				// align-items: center;
+
+				.left {
+					margin-right: 20rpx;
+					width: 158rpx;
+					height: 158rpx;
+					// background-color: red;
+					border-radius: 20rpx;
+					overflow: hidden;
+				}
+
+				.right {
+					// box-sizing: border-box;
+					width: 75vw;
+					overflow: hidden;
+					// background-color: red;
+
+					.heads {
+						font-weight: bold;
+
+						.flag {
+							background: linear-gradient(to bottom, #F84221, #FF6D20);
+							width: 66.59rpx;
+							height: 36.8rpx;
+							text-align: center;
+							font-size: 22.78rpx;
+							color: white;
+							border-radius: 10.51rpx 10.51rpx 10.51rpx 10.51rpx;
+						}
+
+					}
+
+					.goods_card_a {
+						margin-right: 20rpx;
+					}
+
+					.goods_price_a {
+						color: #F84221;
+					}
+
+					.goods_tit_a {
+						overflow: hidden;
+						text-overflow: ellipsis;
+						display: -webkit-box;
+						-webkit-line-clamp: 1;
+						-webkit-box-orient: vertical;
+					}
+
+					.li {
+						display: flex;
+						font-size: 26.29rpx;
+						margin-bottom: 10rpx;
+
+						align-items: center;
+						color: #737373;
+
+						text {
+							margin: 0 10rpx 0;
+						}
+					}
+				}
+			}
+		}
+
+		.address {
+			white-space: nowrap;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			width: 200px;
+		}
+
+
+	}
+</style>
\ No newline at end of file
diff --git a/pages/nongKe/supply_chain/supplier.vue b/pages/nongKe/supply_chain/supplier.vue
index ed7a850..2900889 100644
--- a/pages/nongKe/supply_chain/supplier.vue
+++ b/pages/nongKe/supply_chain/supplier.vue
@@ -7,13 +7,18 @@
 				<view style="height: 10px;">
 
 				</view>
-				<view style="display: flex;justify-content: space-around; align-items: center;">
-					<view class="back" @click='backjJump()'>
-						<view class="iconfont icon-xiangzuo" style="color: #333333;"></view>
-					</view>
-					<view class="" style="font-size: 40rpx;font-weight: 700;transform: skewX(-10deg);">
-						供销综合云市场
+
+
+				<view class="head_tit">
+					<view class="" style="display: flex;align-items: center;">
+						<view class="back" @click='backjJump()' style="margin-right: 17rpx;">
+							<view class="iconfont icon-xiangzuo" style="color: #333333;"></view>
+						</view>
+						<view class="" style="font-size: 40rpx;font-weight: 700;transform: skewX(-10deg);">
+							供销综合云市场
+						</view>
 					</view>
+
 					<view style="position: relative;width: 289.14rpx;">
 						<!-- <text class='iconfont icon-sousuo'></text>
 			<input placeholder='搜索店铺名称' placeholder-class='placeholder' confirm-type='search' name="search"
@@ -30,6 +35,9 @@
 							height="50.82rpx"></u--image>
 					</view>
 				</view>
+
+
+
 			</view>
 			<view class="content">
 				<view style="background-color: red;height: 10px">
@@ -771,6 +779,14 @@
 		/* 可根据实际情况调整容器宽度 */
 	}
 
+	.head_tit {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		box-sizing: border-box;
+		padding: 0 20rpx;
+	}
+
 	.productList {
 		// padding-top: 50rpx;
 		// padding: 0 20rpx 0;
diff --git a/pages/nongKe/supply_chain/supplierA.vue b/pages/nongKe/supply_chain/supplierA.vue
index 946383a..77d7f69 100644
--- a/pages/nongKe/supply_chain/supplierA.vue
+++ b/pages/nongKe/supply_chain/supplierA.vue
@@ -6,12 +6,17 @@
 			<view class="top">
 				<view style="height: 10px;">
 				</view>
-				<view style="display: flex;justify-content: space-around; align-items: center;">
-					<view class="back" @click='backjJump()'>
-						<view class="iconfont icon-xiangzuo" style="color: #333333;"></view>
+				<view class="head_tit">
+					<view class="" style="display: flex;align-items: center;">
+						<view class="back" @click='backjJump()' style="margin-right: 17rpx;">
+							<view class="iconfont icon-xiangzuo" style="color: #333333;"></view>
+						</view>
+						<view class="" style="font-size: 40rpx;font-weight: 700;transform: skewX(-10deg);">
+							{{titName}}
+						</view>
 					</view>
-					<view style="font-size: 40rpx;font-weight: 700;transform: skewX(-10deg);">
-						{{titName}}
+					<view class="">
+
 					</view>
 					<view style="position: relative;">
 						<!-- <text class='iconfont icon-sousuo'></text>
@@ -1034,6 +1039,14 @@
 		margin-left: 10rpx;
 	}
 
+	.head_tit {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		box-sizing: border-box;
+		padding: 0 20rpx;
+	}
+
 	.store-wrapper {
 		margin-top: 235rpx;
 		border-top: 1px solid #F6F6F6;
diff --git a/pages/nongKe/tourism/index.vue b/pages/nongKe/tourism/index.vue
new file mode 100644
index 0000000..ac5f2e8
--- /dev/null
+++ b/pages/nongKe/tourism/index.vue
@@ -0,0 +1,1314 @@
+<template>
+	<view style="background-color: #F0F2F5;min-height: 100vh">
+		<view style="height: var(--status-bar-height);"></view>
+		<view class='productList' :style="viewColor">
+			<!-- 顶部 -->
+			<view class="top">
+				<view style="height: 10px;">
+				</view>
+				<view class="head_tit">
+					<view class="" style="display: flex;align-items: center;">
+						<view class="back" @click='backjJump()' style="margin-right: 17rpx;">
+							<view class="iconfont icon-xiangzuo" style="color: #333333;"></view>
+						</view>
+						<view style="font-size: 40rpx;font-weight: 700;transform: skewX(-10deg);">
+							<!-- {{titName}} -->
+							特色文旅
+						</view>
+					</view>
+
+					<view class="">
+
+					</view>
+					<view style="position: relative;">
+						<!-- <text class='iconfont icon-sousuo'></text>
+			<input placeholder='搜索店铺名称' placeholder-class='placeholder' confirm-type='search' name="search"
+				:value='sotreParam.keyword' @confirm="searchSubmit"></input> -->
+						<u-search borderColor="#FF6D20" bgColor="white" :showAction="false" placeholder="搜索店铺名称"
+							v-model="sotreParam.keyword" class="serch_cls"></u-search>
+						<u--image @tap="searchSubmit" class="img_cls" style="position: absolute; top: 3px;right: 3px;"
+							:showLoading="true" src="/static/images/GXSC/SS.png" width="115.65rpx"
+							height="56.82rpx"></u--image>
+					</view>
+
+				</view>
+			</view>
+			<view class="content">
+				<view class="hot_serch">
+					<!-- <text>热搜:</text> <text>热a搜商品</text> <text>热搜商品</text>
+					<text>热搜sasas商品</text> -->
+				</view>
+
+				<!-- <view class="menu_cls">
+					<u-scroll-list>
+						<view class="menu_li" @click="navGo(item.merchant_category_id)" v-for="item,index in menuList"
+							:key="index">
+							<u--image :showLoading="true" :src="imgList[index]" width="94.63rpx" height="99.63rpx"
+								style="margin-bottom: 20rpx;"></u--image>
+							<text style="display: block;    width: 15vw;">{{item.category_name}}</text>
+						</view>
+					</u-scroll-list>
+				</view> -->
+
+				<view class="goods_list">
+					<view class="goods_card" @click="goStore(item.mer_id)" v-for="(item,index) in storeList"
+						:key="index">
+						<view class="left">
+							<u--image :showLoading="true" :src="item.mer_avatar" width="157.71rpx"
+								height="157.71rpx"></u--image>
+						</view>
+						<view class="right">
+							<view class="li head" style="display: flex;">
+								<text class="com_name">{{item.mer_name}}</text>
+								<text
+									style="font-weight: normal; font-size: 10rpx;color: red;padding:0 10rpx; border-radius: 10rpx; border: 1px solid red;">{{item.type_name}}</text>
+							</view>
+							<view class="li">
+								<u--image v-for="item,index in [1,1,,1,1,1]" :key="index" :showLoading="true"
+									src="/static/images/GXSC/PF.png" width="20.85rpx" height="19.85rpx"></u--image>
+								<text style="margin-left: 20rpx;color: #FF6D20; ">5.0</text>
+								<text>月销2000+</text>
+							</view>
+							<view class="li" style="align-items: center;">
+								<u--image :showLoading="true" src="/static/images/GXSC/DH.png" width="33.85rpx"
+									height="33.85rpx"></u--image>
+								<text> {{item.service_phone}}</text>
+							</view>
+							<view class="li" style="align-items: center;">
+								<u--image :showLoading="true" src="/static/images/GXSC/SJ.png" width="33.85rpx"
+									height="33.85rpx"></u--image>
+								<text>{{item.mer_take_time[0]}}-{{item.mer_take_time[1]}}</text>
+							</view>
+							<view class="li" style="align-items: center;">
+								<u--image :showLoading="true" src="/static/images/GXSC/DW.png" width="33.85rpx"
+									height="33.85rpx"></u--image>
+								<text class="address">{{item.mer_address}}</text>
+							</view>
+						</view>
+
+					</view>
+
+				</view>
+
+
+			</view>
+
+			<!-- 热搜 -->
+
+
+
+			<!-- <view class="nav-wrapper" :class="'styleType'+store_street_theme">
+				<view class='nav acea-row row-middle' :class="'styleType'+store_street_theme">
+					<view v-for="item in downMenus" :key="item.key" class='item'
+						:class="{'font-colors':firstKey == item.key}" @click='set_where(item.key)'>
+						<view class="">
+							{{item.title}}
+						</view>
+						<view class="line" :class="{'font-line':firstKey == item.key}">
+						</view>
+					</view>
+
+				</view>
+			</view>
+			
+			 -->
+
+			<!-- 店铺 -->
+			<!-- 
+			<block>
+				<view class="store-wrapper">
+					<view class="store-item" v-for="(item,index) in storeList" :key="index">
+						<view class="head">
+							<view class="bgc_img" :style="{ backgroundImage: `url(${item.mini_banner})`}">
+							</view>
+							<view class="zhezhao">
+							</view>
+							<view class="zhezhao1" @click="goStore(item.mer_id)">
+								<view class="title">
+									<view>{{item.mer_name}}
+									</view>
+									<span>
+										{{item.type_name}}
+									</span>
+								</view>
+								<view class="coent">
+									<view class="avater">
+										<image :src="item.mer_avatar" mode=""></image>
+									</view>
+									<view class=" text">
+										<view class="text_one">
+											<view class="">
+												<image src="@/static/images/phone.png" mode=""></image>
+												{{item.service_phone}}
+											</view>
+											<view class="text_one_r">
+												<image src="@/static/images/clock.png" mode=""></image>
+												{{item.mer_take_time[0]}}-{{item.mer_take_time[1]}}
+											</view>
+										</view>
+										<view class="text_two">
+											<image src="@/static/images/shangpu.png" mode=""></image>
+											{{item.mer_info}}
+										</view>
+										<view class="text_three">
+											<image src="@/static/images/dingwei.png" mode=""></image>
+											{{item.mer_address}}
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</block>
+			<block v-if="store_street_theme == 2">
+				<view class="mer-item2" v-for="(item,index) in storeList" :key='index'>
+					<view class="mer-hd mer-shop-count" @click="goStore(item.mer_id)">
+						<image class="mer-avatar" :src="item.mer_avatar"></image>
+						<view class="mer-shop-right">
+							<view class="mer-count">
+								<view class="mer-top">
+									<view class="txt line1">{{item.mer_name}}</view>
+									<text v-if="item.type_name" class="font-bg-red ml8">{{item.type_name}}</text>
+									<text v-else-if="item.is_trader" class="font-bg-red ml8">自营</text>
+								</view>
+								<view class="mer-btn">
+									<view class="">
+										{{item.care_count<10000 ? item.care_count : (item.care_count/10000).toFixed(2)+'万'}}人关注
+									</view>
+									<view class="line" v-if="item.distance"></view>
+									<view class="distance" v-if="item.distance" @click.stop="showStoreLocation(item)">
+										<view class="">
+											{{item.distance}}
+										</view>
+										<view class="iconfont icon-xiangyou"></view>
+									</view>
+								</view>
+							</view>
+							<view class="pro-box">
+								<navigator :url="`/pages/goods_details/index?id=${itemn.product_id}`" hover-class="none"
+									class="pro-item" v-for="(itemn,indexn) in item.recommend" :key='indexn'>
+									<view class="picture">
+										<easy-loadimage mode="widthFix" :image-src="itemn.image"></easy-loadimage>
+										<view v-if="itemn.border_pic"
+											:style="{ backgroundImage: `url(${itemn.border_pic})` }"
+											class="border-picture"></view>
+									</view>
+									<view class="price">
+										<text>￥</text>{{itemn.price}}
+									</view>
+								</navigator>
+							</view>
+						</view>
+					</view>
+				</view>
+			</block>
+			<block v-if="store_street_theme == 3">
+				<view class="mer-item mer-item3" v-for="(item,index) in storeList" :key='index'
+					:style="'background-image:url('+item.mini_banner+')'">
+					<view class="mer-hd" @click="goStore(item.mer_id)">
+						<view class="mer-name">
+							<image :src="item.mer_avatar"></image>
+							<view class="">
+								<view class="mer-top">
+									<view class="txt line1">{{item.mer_name}}</view>
+									<text v-if="item.type_name" class="font-bg-red ml8">{{item.type_name}}</text>
+									<text v-else-if="item.is_trader" class="font-bg-red ml8">自营</text>
+								</view>
+								<view class="mer-btn">
+									<view class="">
+										{{item.care_count<10000 ? item.care_count : (item.care_count/10000).toFixed(2)+'万'}}人关注
+									</view>
+									<view class="line" v-if="item.distance"></view>
+									<view class="distance" v-if="item.distance" @click.stop="showStoreLocation(item)">
+										<view class="">
+											{{item.distance}}
+										</view>
+										<view class="iconfont icon-xiangyou"></view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="pro-box" :class="'styleType'+store_street_theme">
+						<view class="pro-item" v-for="(itemn,indexn) in item.recommend" :key='indexn' v-if="indexn<=2">
+							<view @click="go_details(itemn.product_type,itemn.product_id)">
+								<view class="picture">
+									<image :src="itemn.image"></image>
+									<view v-if="itemn.border_pic"
+										:style="{ backgroundImage: `url(${itemn.border_pic})` }" class="border-picture">
+									</view>
+								</view>
+								<view class="price">
+									<text>￥</text>{{itemn.price}}
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</block>
+			<view class='loadingicon acea-row row-center-wrapper' v-if="loading">
+				<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
+			</view>
+		 -->
+
+
+		</view>
+		<view class='no-shop' v-if="!storeList.length && !loading && !loadingIcon" v-cloak>
+			<view class='pictrue' style="margin: 0 auto;background-color: #F0F2F5;">
+				<image src='../../../static/images/noCart.png'></image>
+				<text>暂无店铺，快去搜索其他店铺吧</text>
+			</view>
+		</view>
+		</block>
+		<u-popup class="pop" :show="show" @close="close" mode="center" bgColor='transparent'>
+			<image :src="image"></image>
+			<image src="@/static/images/guanbi.png" class="guanbi" @click="close"></image>
+		</u-popup>
+	</view>
+
+	</view>
+</template>
+
+<script>
+	import {
+		storeMerchantList,
+		getGeocoder,
+		supMenuApi,
+		supAgoodsApi
+	} from '@/api/store.js';
+
+	import {
+		merClassifly,
+		getStoreTypeApi
+	} from '@/api/store.js';
+	import {
+		mapGetters
+	} from "vuex";
+	import {
+		goShopDetail
+	} from '@/libs/order.js'
+	import {
+		configMap
+	} from '@/utils';
+	import easyLoadimage from '@/components/easy-loadimage/easy-loadimage.vue';
+	const app = getApp();
+	export default {
+		components: {
+			easyLoadimage
+		},
+		data() {
+			return {
+
+				titName: "坝坝宴",
+				price: 0,
+				stock: 0,
+				nows: false,
+				loading: false,
+				loadingIcon: true,
+				loadTitle: '加载更多',
+				title: '',
+				hotPage: 1,
+				hotLimit: 10,
+				hotScroll: false,
+				// 筛选框
+				rightBox: false,
+				//品牌列表
+				brandList: [],
+				downKey: 0,
+				downStatus: false,
+				menuList: [],
+				// 下拉菜单
+				downMenu: [{
+						title: '默认',
+						key: 0,
+						order: ""
+					},
+					{
+						title: '销量',
+						key: 1,
+						order: 'sales'
+					},
+					{
+						title: '好评',
+						key: 2,
+						order: 'rate'
+					},
+					{
+						title: '距离',
+						key: 3,
+						order: 'location'
+					}
+				],
+				// 是否第一个
+				firstKey: 0,
+				// 商铺列表
+				storeList: [],
+				sotreParam: {
+					keyword: '',
+					page: 1,
+					limit: 10,
+					order: '',
+					category_id: '',
+					type_id: '',
+					street_id: '',
+					type_code: '',
+
+				},
+				storeKey: 0,
+				storeScroll: true,
+				mer_id: '',
+				sortId: '',
+				price_on: '',
+				price_off: '',
+				detaile_address: "",
+				recommend_address: "",
+				location_address: "",
+				latitude: "",
+				longitude: "",
+				count: 0,
+				storeTypeArr: [], //店铺类型
+				merList: [], //商户分类
+				product_type: 0,
+				show: false,
+				image: '', //图片,
+				credit_buy: '', //支持先货后款
+			};
+		},
+		onLoad(options) {
+			this.sotreParam.type_code = options.type_code
+			this.storeList = [];
+			if (this.mer_location == 1) {
+				this.selfLocation()
+			}
+			this.storeMerchantList();
+			this.getClassfication();
+			this.getStoreType();
+
+
+
+		},
+		computed: {
+			downMenus: function() {
+				return this.downMenu.filter((item) => {
+					if (this.mer_location) {
+						return item
+					} else {
+						return item.key < 3
+					}
+				})
+			},
+			...configMap({
+				margin_ico_switch: 0,
+				margin_ico: '',
+				mer_location: 0,
+				store_street_theme: 1,
+				hide_mer_status: '',
+			}, mapGetters(['viewColor'])),
+		},
+		methods: {
+			navGo(id) {
+				uni.navigateTo({
+					url: `/pages/nongKe/supply_chain/supplierA?type_id=10&?merchant_category_id=${id}`
+				})
+			},
+			go_details: function(product_type, product_id) {
+				if (product_type == 98) {
+					uni.navigateTo({
+						url: `/pages/admin/goods_details/index?product_id=${product_id}&product_type=${product_type}`
+					})
+				}
+				if (product_type == 0) {
+					uni.navigateTo({
+						url: `/pages/goods_details/index?id=${product_id}`
+					})
+				}
+			},
+			// 获取商户分类
+			getClassfication: function() {
+				let temp = []
+				merClassifly()
+					.then(res => {
+						temp = res.data.map(item => {
+							return {
+								...item,
+								check: false
+							}
+						})
+						if (this.sotreParam.category_id.length > 0) {
+							this.sotreParam.category_id.forEach((ids, index) => {
+								temp.forEach(el => {
+									if (ids == el.merchant_category_id) {
+										el.check = true
+									}
+								})
+							})
+						}
+						this.merList = temp
+					})
+					.catch(res => {
+						this.$util.Tips({
+							title: res
+						});
+					});
+			},
+			// 获取店铺类型
+			getStoreType: function() {
+				let temp = []
+				getStoreTypeApi().then(res => {
+						res.data.forEach(item => {
+							if (item.mer_type_id == this.sotreParam.type_id) {
+								temp.push({
+									...item,
+									check: true
+								})
+							}
+						})
+						this.storeTypeArr = temp
+					})
+					.catch(res => {
+						this.$util.Tips({
+							title: res
+						});
+					});
+			},
+			/** 打开地图**/
+			showMaoLocation(lat, long) {
+				if (!lat || !long) return this.$util.Tips({
+					title: '请设置允许商城访问您的位置！'
+				});
+				//#ifdef H5
+				if (this.$wechat.isWeixin() === true) {
+					this.$wechat.seeLocation({
+						latitude: Number(lat),
+						longitude: Number(long),
+						name: '当前位置',
+						address: this.location_address
+					}).then(res => {
+						// console.log('success');
+					})
+				} else {
+					//#endif
+					uni.openLocation({
+						latitude: parseFloat(lat),
+						longitude: parseFloat(long),
+						name: '当前位置',
+						address: this.location_address,
+						scale: 8,
+						success: function(res) {
+							// console.log(res)
+						},
+					});
+					// #ifdef H5
+				}
+				//#endif	
+			},
+			showStoreLocation(item) {
+				if (!item.lat || !item.long) return this.$util.Tips({
+					title: '请设置允许商城访问您的位置！'
+				});
+				//#ifdef H5
+				if (this.$wechat.isWeixin() === true) {
+					this.$wechat.seeLocation({
+						latitude: Number(item.lat),
+						longitude: Number(item.long),
+						name: item.mer_name,
+						address: item.mer_address ? item.mer_address : '',
+					}).then(res => {
+						// console.log('success');
+					})
+				} else {
+					//#endif
+					uni.openLocation({
+						latitude: parseFloat(item.lat),
+						longitude: parseFloat(item.long),
+						scale: 8,
+						name: item.mer_name,
+						address: item.mer_address ? item.mer_address : '',
+						success: function(res) {
+							// console.log(res)
+						},
+					});
+					// #ifdef H5
+				}
+				//#endif	
+			},
+			selfLocation() {
+				let self = this
+				uni.getLocation({
+					type: 'gcj02',
+					success: (res) => {
+						let latitude, longitude;
+						latitude = res.latitude.toString();
+						longitude = res.longitude.toString();
+						this.latitude = res.latitude
+						this.longitude = res.longitude
+						getGeocoder({
+							lat: latitude,
+							long: longitude
+						}).then(res => {
+							// console.log(res)
+							this.detaile_address = res.data.address;
+							this.location_address = res.data.address;
+							this.recommend_address = res.data.address.length > 4 ? res.data.address
+								.slice(0, 4) + '...' :
+								res.data.address
+						}).catch(err => {
+							uni.showToast({
+								title: err,
+								icon: 'none'
+							})
+						})
+					},
+					fail: (res) => {
+						uni.showToast({
+							title: res,
+							icon: 'none',
+							duration: 1000
+						});
+					},
+				});
+			},
+			// 查找店铺
+			storeMerchantList() {
+				if (this.loading) return
+				this.loading = true
+				let rqData = {
+					keyword: this.sotreParam.keyword,
+					page: this.sotreParam.page,
+					limit: 10,
+					type_code: this.sotreParam.type_code,
+				}
+				if (this.latitude) {
+					rqData.location = this.latitude + ',' + this.longitude
+				}
+				// console.log(rqData)
+				storeMerchantList(rqData).then(res => {
+					this.count = res.data.count
+					this.storeList = this.storeList.concat(res.data.list)
+					this.loading = false
+					this.loadingIcon = false
+					// this.titName = this.storeList[0].mer_info
+				})
+			},
+			// 进店
+			goStore(id) {
+				if (this.sotreParam.type_id == 12) {
+					uni.navigateTo({
+						url: `/pages/nongKe/supply_chain/merchant?id=${id}`
+					})
+				} else {
+					if (this.hide_mer_status != 1) {
+						uni.navigateTo({
+							url: `/pages/store/home/index?id=${id}&type=7`
+						})
+					}
+				}
+			},
+			searchSubmit: function() {
+				let that = this;
+				that.$set(that.sotreParam, 'keyword', this.sotreParam.keyword);
+				this.set_where(this.firstKey)
+			},
+			// 右侧切换
+			bindRight() {
+				this.sotreParam.page = 1
+				this.rightBox = true
+			},
+			// 组件确定
+			confirm(data) {
+				let arr1 = [],
+					arr2 = []
+				if (data.storeTypeArr.length == 0) {
+					// this.sotreParam.type_id = ''
+				} else {
+					data.storeTypeArr.forEach(item => {
+						arr1.push(item.mer_type_id)
+					})
+					this.sotreParam.type_id = arr1.toString();
+				}
+				if (data.merList.length == 0) {
+					this.sotreParam.category_id = ''
+				} else {
+					data.merList.forEach(item => {
+						arr2.push(item.merchant_category_id)
+					})
+					this.sotreParam.category_id = arr2.toString();
+				}
+				this.rightBox = data.status
+				this.loadend = false;
+				this.$set(this.sotreParam, 'page', 1)
+				this.storeList = [];
+				this.storeMerchantList();
+			},
+			// 组件关闭
+			close() {
+				this.rightBox = false
+				this.show = false
+			},
+			//点击事件处理
+			set_where: function(e) {
+				if (this.loading) return
+				this.storeList = []
+				this.firstKey = e
+				this.sotreParam.page = 1
+				this.sotreParam.order = this.downMenu[e].order
+				this.storeMerchantList();
+			},
+			backjJump() {
+				uni.navigateBack({
+					delta: 1
+				})
+			},
+			// 滚动监听
+			onPageScroll(e) {
+				// 传入scrollTop值并触发所有easy-loadimage组件下的滚动监听事件
+				uni.$emit('scroll');
+			},
+			qctail(item) {
+				// console.log(item);
+				if (item.mer_certificate == '') {
+					return
+				}
+				this.show = true
+				this.image = item.mer_certificate[0]
+				// console.log(this.show);
+			},
+		},
+		//刷新
+		onPullDownRefresh() {
+			uni.stopPullDownRefresh()
+		},
+		//上划加载更多
+		onReachBottom() {
+			if (this.count === this.storeList.length) {
+				if (this.count === 0) {
+					return
+				}
+				uni.showToast({
+					title: '已加载全部',
+					icon: 'none',
+					duration: 1000
+				});
+			} else {
+				this.sotreParam.page += 1
+				this.storeMerchantList()
+			}
+		}
+
+	}
+</script>
+
+<style lang="scss" scoped>
+	* {
+		margin: 0;
+		padding: 0;
+	}
+
+	.com_name {
+		font-size: 32rpx;
+		// background-color: red;
+
+		white-space: nowrap;
+		/* 防止文字换行 */
+		overflow: hidden;
+		/* 超出部分隐藏 */
+		text-overflow: ellipsis;
+		max-width: 45vw;
+		/* 使用省略号表示溢出的内容 */
+
+		/* 可根据实际情况调整容器宽度 */
+	}
+
+	.serch_cls {
+		// padding-right: 200rpx;
+	}
+
+	.productList {
+		// padding-top: 50rpx;
+		// padding: 0 20rpx 0;
+
+		.top {
+			padding-top: var(--status-bar-height);
+			/* #ifdef H5 */
+			padding-top: 30rpx;
+			/* #endif */
+			background-color: #F0F2F5;
+			position: fixed;
+			z-index: 999;
+			width: 100%;
+			top: 0;
+		}
+
+		.content {
+			padding: 20rpx;
+		}
+
+		.menu_cls {
+			background-color: white;
+			// height: 199.77rpx;
+			border-radius: 21.03rpx 21.03rpx 21.03rpx 21.03rpx;
+			padding: 20rpx;
+
+			.menu_li {
+				margin-right: 50rpx;
+				// background-color: red;
+				width: 50vw;
+				// width: 120rpx;
+				// display: inline-block;
+			}
+
+
+		}
+
+		.goods_list {
+			margin-top: 20rpx;
+
+			.goods_card {
+				margin-top: 20rpx;
+				height: auto;
+				background-color: white;
+				padding: 20rpx;
+				border-radius: 20rpx;
+				display: flex;
+				// align-items: center;
+
+				.left {
+					margin-right: 20rpx;
+					width: 158rpx;
+					height: 158rpx;
+					border-radius: 20rpx;
+					overflow: hidden;
+				}
+
+				.right {
+					.head {
+						font-weight: bold;
+						// color: red;
+
+					}
+
+					.li {
+						display: flex;
+						font-size: 26.29rpx;
+						margin-bottom: 10rpx;
+						align-items: center;
+
+						text {
+							margin: 0 20rpx 0 5rpx;
+						}
+					}
+				}
+			}
+		}
+
+		.address {
+			white-space: nowrap;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			width: 200px;
+		}
+
+
+	}
+
+
+	.search-right.styleType2 .right-text,
+	.search-right.styleType3 .right-text {
+		color: #282828;
+	}
+
+	.search-right.styleType2 .icon-xiangyou,
+	.search-right.styleType3 .icon-xiangyou {
+		color: #999999;
+	}
+
+	.search-right.styleType2 .icon-dingwei,
+	.search-right.styleType3 .icon-dingwei {
+		color: #8A8A8A;
+	}
+
+	.productList .search .back {
+		display: flex;
+		align-items: center;
+		width: 40rpx;
+		height: 60rpx;
+
+		.iconfont {
+			color: #fff;
+			font-size: 36rpx;
+		}
+	}
+
+	.hot_serch {
+		color: #B3B3B3;
+		display: flex;
+		justify-content: space-around;
+		margin: 20rpx 0;
+		flex-wrap: wrap;
+		// margin-top: 50rpx;
+		padding-top: 50rpx;
+		/* #ifdef H5 */
+		padding-top: 100rpx;
+		/* #endif */
+
+		text {
+			margin: 10rpx;
+		}
+	}
+
+	.productList .search .input {
+		flex: 1;
+		height: 60rpx;
+		background-color: #fff;
+		border-radius: 50rpx;
+		padding: 0 20rpx;
+		box-sizing: border-box;
+	}
+
+	.productList .search.styleType2 .input,
+	.productList .search.styleType3 .input {
+		background: #EDEDED;
+	}
+
+	.productList .search .input input {
+		flex: 1;
+		height: 100%;
+		font-size: 26rpx;
+		margin-left: 10rpx;
+	}
+
+	.productList .search .input .placeholder {
+		color: #999;
+	}
+
+	.productList .search .input .iconfont {
+		font-size: 35rpx;
+		color: #555;
+	}
+
+	.productList .search .icon-pailie,
+	.productList .search .icon-tupianpailie {
+		color: #fff;
+		width: 62rpx;
+		font-size: 40rpx;
+		height: 86rpx;
+		line-height: 86rpx;
+	}
+
+	.productList .nav-wrapper {
+		z-index: 9;
+		position: fixed;
+		left: 0;
+		top: 25px;
+		width: 100%;
+		margin-top: 86rpx;
+		background-color: #fff;
+
+		&.styleType1 {
+			background-color: var(--view-theme);
+		}
+
+		.tab-bar {
+			display: flex;
+			align-items: center;
+
+			.tab-item {
+				position: relative;
+				flex: 1;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				padding: 8rpx 0 20rpx;
+				color: #fff;
+				font-size: 28rpx;
+				font-weight: bold;
+
+				&::after {
+					content: ' ';
+					position: absolute;
+					left: 50%;
+					bottom: 18rpx;
+					width: 30rpx;
+					height: 3rpx;
+					background: transparent;
+					transform: translateX(-50%);
+				}
+
+				&.on {
+					&::after {
+						background: #fff;
+					}
+				}
+			}
+		}
+	}
+
+	.head_tit {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		box-sizing: border-box;
+		padding: 0 20rpx;
+	}
+
+	.border-picture {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		background: center/cover no-repeat;
+	}
+
+	.productList .nav {
+		height: 86rpx;
+		color: #454545;
+		font-size: 28rpx;
+		display: flex;
+		justify-content: space-between;
+		padding: 0 28rpx;
+	}
+
+	.productList .nav .item {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-direction: column;
+		color: #FFFFFF;
+		flex: 1;
+	}
+
+	.productList .nav.styleType2 .item,
+	.productList .nav.styleType3 .item {
+		color: #282828;
+	}
+
+	.productList .nav .item.font-colors {
+		font-weight: 500;
+		color: #FFFFFF;
+	}
+
+	.productList .nav.styleType2 .item.font-colors,
+	.productList .nav.styleType3 .item.font-colors {
+		color: var(--view-theme);
+	}
+
+	.productList .nav .item .font-line {
+		height: 4rpx;
+		background-color: #fff;
+		margin-top: 3rpx;
+		width: 28rpx;
+		animation: line 0.3s;
+		-moz-animation: line 0.3s;
+		/* Firefox */
+		-webkit-animation: line 0.3s;
+		/* Safari 和 Chrome */
+		-o-animation: line 0.3s;
+		/* Opera */
+	}
+
+	.productList .nav.styleType2 .item .font-line,
+	.productList .nav.styleType3 .item .font-line {
+		background-color: var(--view-theme);
+	}
+
+	@keyframes line {
+		from {
+			width: 0rpx;
+		}
+
+		to {
+			width: 28rpx;
+		}
+	}
+
+	.productList .nav .item image {
+		width: 15rpx;
+		height: 19rpx;
+		margin-left: 10rpx;
+	}
+
+	.store-wrapper {
+		margin-top: 235rpx;
+		border-top: 1px solid #F6F6F6;
+
+		.store-item {
+			margin: 20rpx auto;
+
+			.head {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				color: #fff;
+
+				.zhezhao {
+					position: absolute;
+					width: 95%;
+					height: 150px;
+					border-radius: 20rpx;
+					z-index: 0;
+					opacity: 0.5;
+					background-color: #999;
+				}
+
+				.bgc_img {
+					position: absolute;
+					width: 95%;
+					height: 150px;
+					background-size: cover;
+					border-radius: 20rpx;
+					z-index: 0;
+				}
+
+				.zhezhao1 {
+					width: 100%;
+					height: 150px;
+					border-radius: 20rpx;
+					z-index: 1;
+
+					.title {
+						display: flex;
+						height: 50px;
+						align-items: center;
+						margin-left: 20px;
+						z-index: 1;
+
+						span {
+							background-color: #F84221;
+							color: white;
+							font-size: 12px;
+							padding: 3px;
+							border-radius: 5px;
+							margin-left: 5px;
+						}
+					}
+
+					.coent {
+						display: flex;
+						margin-left: 20px;
+
+						.avater {
+							width: 60px;
+							height: 80px;
+
+							image {
+								width: 60px;
+								height: 80px;
+							}
+						}
+
+						.text {
+							.text_one {
+								display: flex;
+								height: 30px;
+								line-height: 30px;
+								padding-left: 10px;
+
+								image {
+									width: 20px;
+									height: 20px;
+									margin-right: 10px;
+								}
+
+								.text_one_r {
+									margin-left: 10px;
+								}
+							}
+
+							.text_two {
+								width: 270px;
+								height: 30px;
+								line-height: 30px;
+								padding-left: 10px;
+								white-space: nowrap;
+								overflow: hidden;
+								text-overflow: ellipsis;
+
+								image {
+									width: 20px;
+									height: 20px;
+									margin-right: 10px;
+								}
+							}
+
+							.text_three {
+								width: 270px;
+								height: 30px;
+								line-height: 30px;
+								padding-left: 10px;
+								white-space: nowrap;
+								overflow: hidden;
+								text-overflow: ellipsis;
+
+								image {
+									width: 20px;
+									height: 20px;
+									margin-right: 10px;
+								}
+							}
+						}
+
+					}
+				}
+
+
+			}
+
+			.pro-box {
+				white-space: nowrap;
+				display: flex;
+				align-items: center;
+				padding: 20rpx 20rpx 30rpx;
+
+				.pro-item {
+					display: inline-block;
+					width: 218rpx;
+					margin-right: 14rpx;
+
+					.picture,
+					/deep/image,
+					uni-image {
+						width: 100%;
+						height: 214rpx;
+						border-radius: 8rpx;
+						position: relative;
+					}
+
+					.price {
+						margin-top: 5rpx;
+						font-size: 28rpx;
+						color: var(--view-priceColor);
+						font-weight: bold;
+
+						text {
+							font-size: 28rpx;
+						}
+					}
+
+					&:last-child {
+						margin-right: 0;
+					}
+				}
+
+				&.styleType3 {
+					padding: 20rpx;
+
+					.pro-item {
+						display: inline-block;
+						background-color: #fff;
+						border-radius: 16rpx;
+						text-align: center;
+						padding: 10rpx 0 20rpx;
+
+						.picture,
+						/deep/image,
+						uni-image {
+							width: 194rpx;
+							height: 194rpx;
+							text-align: center;
+							border-radius: 8rpx;
+							position: relative;
+							margin: 0 auto;
+						}
+					}
+				}
+			}
+		}
+	}
+
+	.mer-item2 {
+		padding: 20rpx;
+		background: #fff;
+		margin-bottom: 20rpx;
+		border-radius: 16rpx;
+
+		.mer-shop-count {
+			display: flex;
+
+			.mer-avatar {
+				width: 100rpx;
+				height: 100rpx;
+			}
+
+			.mer-top {
+				color: #282828;
+			}
+
+			.mer-shop-right {
+				margin-left: 20rpx;
+
+				.mer-btn {
+					color: #666666;
+				}
+
+			}
+
+			.pro-box {
+				white-space: nowrap;
+				display: flex;
+				align-items: center;
+				margin-top: 20rpx;
+
+				.pro-item {
+					display: inline-block;
+					width: 170rpx;
+					margin-right: 20rpx;
+
+					.picture,
+					/deep/image,
+					uni-image,
+					/deep/.easy-loadimage {
+						width: 100%;
+						height: 170rpx;
+						border-radius: 8rpx;
+						position: relative;
+					}
+
+					.price {
+						margin-top: 5rpx;
+						font-size: 28rpx;
+						color: var(--view-priceColor);
+						font-weight: bold;
+
+						text {
+							font-size: 28rpx;
+						}
+					}
+
+					&:last-child {
+						margin-right: 0;
+					}
+				}
+			}
+		}
+
+	}
+
+	.no-shop {
+		background-color: #fff;
+		// padding-bottom: calc(100% - 176rpx);
+
+		.pictrue {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			color: $uni-nothing-text;
+
+			image {
+				width: 414rpx;
+				height: 380rpx;
+			}
+		}
+	}
+
+	.guanbi {
+		width: 20px;
+		height: 20px;
+		margin: 30px auto;
+	}
+
+	.pop {
+		z-index: 1;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/supply_chains/supply_chains.vue b/pages/supply_chains/supply_chains.vue
index d2a8333..8c6dbc5 100644
--- a/pages/supply_chains/supply_chains.vue
+++ b/pages/supply_chains/supply_chains.vue
@@ -1,90 +1,82 @@
 <template>
-  <view class="Circle_friends">
-    <view class="circle_friends_wrapper">
-      <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>
-    
+	<view class="Circle_friends">
+		<view class="circle_friends_wrapper">
+			<view v-if="isFshow">
+				<view class="site-box flex_a_c_j_sb" :style="{'background-color':backColor}">
 
-      <zbpSwiper
-        :isSelectPlace="true"
-        :town="street"
-        :streetname="street"
-        :location_Arr="locationArr"
-        @change="dchange"
-      >
-      </zbpSwiper>
+					<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="list">
-        <navigator
-          hover-class="none"
-          :url="`/pages/nongKe/supply_chain/supplier?type_id=10&street_id=${street_id}`"
-        >
-          <view class="list-m">
-            <image src="@/static/images/f6.png" mode="aspectFit"></image>
-            <view class="list-title">
-              <view class="list-titlea">
-                <image src="@/static/images/p9.png" mode="aspectFit"></image>
-                <view class="titlea-con">
-                  <view class="titlea">september</view>
-                  <view class="titleb"> 9月 </view>
-                </view>
-              </view>
-              <view class="list-titleb">
-                <view class="titlea">
-                  {{ town }}
-                </view>
-                <view class="titleb"> 综合供销云市场 </view>
-              </view>
-            </view>
-            <view class="list-title-info" style="color: #3a7331">
-              <view class=""> 点击查看 </view>
 
-              <view class="title-infoimg">
-                <image src="@/static/images/pj.png" mode="aspectFit"></image>
-              </view>
-            </view>
-          </view>
-        </navigator>
+			</view>
 
-        <view class="list-m" @click="go_shop">
-          <image src="@/static/images/f1.png" mode="aspectFit"></image>
-          <view class="list-title">
-            <view class="list-titlea">
-              <image src="@/static/images/p8.png" mode="aspectFit"></image>
-            </view>
-            <view class="list-titleb">
-              <view class="titlea"> 里海云仓 </view>
-              <view class="titleb"> 行业分类市场 </view>
-            </view>
-          </view>
-          <view class="list-title-info" style="color: #ff6b00">
-            <view class=""> 点击查看 </view>
-            <view class="title-infoimg">
-              <image src="@/static/images/pj1.png" mode="aspectFit"></image>
-            </view>
-          </view>
-        </view>
-      </view>
 
-      <view class="list-con">
-        <view
-          class="list-con-left"
-          @tap="navgo('/pages/nongKe/specialty/index')"
-        >
-          <!-- <view class="list-con-title">
+			<zbpSwiper :isSelectPlace="true" :town="street" :streetname="street" :location_Arr="locationArr"
+				@change="dchange">
+			</zbpSwiper>
+
+			<view class="list">
+				<navigator hover-class="none"
+					:url="`/pages/nongKe/supply_chain/supplier?type_id=10&street_id=${street_id}`">
+					<view class="list-m">
+						<image src="@/static/images/f6.png" mode="aspectFit"></image>
+						<view class="list-title">
+							<view class="list-titlea">
+								<image src="@/static/images/p9.png" mode="aspectFit"></image>
+								<view class="titlea-con">
+									<view class="titlea">september</view>
+									<view class="titleb"> 9月 </view>
+								</view>
+							</view>
+							<view class="list-titleb">
+								<view class="titlea">
+									{{ town }}
+								</view>
+								<view class="titleb"> 综合供销云市场 </view>
+							</view>
+						</view>
+						<view class="list-title-info" style="color: #3a7331">
+							<view class=""> 点击查看 </view>
+
+							<view class="title-infoimg">
+								<image src="@/static/images/pj.png" mode="aspectFit"></image>
+							</view>
+						</view>
+					</view>
+				</navigator>
+
+				<view class="list-m" @click="go_shop">
+					<image src="@/static/images/f1.png" mode="aspectFit"></image>
+					<view class="list-title">
+						<view class="list-titlea">
+							<image src="@/static/images/p8.png" mode="aspectFit"></image>
+						</view>
+						<view class="list-titleb">
+							<view class="titlea"> 里海云仓 </view>
+							<view class="titleb"> 行业分类市场 </view>
+						</view>
+					</view>
+					<view class="list-title-info" style="color: #ff6b00">
+						<view class=""> 点击查看 </view>
+						<view class="title-infoimg">
+							<image src="@/static/images/pj1.png" mode="aspectFit"></image>
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<view class="list-con">
+				<view class="list-con-left"
+					@tap="navgo('/pages/nongKe/specialty/index?type_code=TypeFamousSpecialties')">
+					<!-- <view class="list-con-title">
 						<view class="con-titlea">
 							名优特产
 						</view>
@@ -92,15 +84,12 @@
 							精选当地特色特产
 						</view>
 					</view> -->
-          <image src="@/static/images/f5.png" mode="aspectFit"></image>
-        </view>
-        <view class="list-con-right">
-          <view
-            class="con-right"
-            style="margin-bottom: 20rpx"
-            @click="navaction(1)"
-          >
-            <!-- <view class="list-con-title">
+					<image src="@/static/images/f5.png" mode="aspectFit"></image>
+				</view>
+				<view class="list-con-right">
+					<view class="con-right" style="margin-bottom: 20rpx"
+						@tap="navgo('/pages/nongKe/food/index?type_code=TypeLocalCuisine')">
+						<!-- <view class="list-con-title">
 							<view class="con-titlea">
 								当地美食
 							</view>
@@ -108,10 +97,10 @@
 								美食线上一条街
 							</view>
 						</view> -->
-            <image src="@/static/images/f7.png" mode="aspectFit"></image>
-          </view>
-          <view class="con-right" @click="navaction(2)">
-            <!-- <view class="list-con-title">
+						<image src="@/static/images/f7.png" mode="aspectFit"></image>
+					</view>
+					<view class="con-right" @tap="navgo('/pages/nongKe/tourism/index?type_code=TypeFeaturedCultural')">
+						<!-- <view class="list-con-title">
 							<view class="con-titlea">
 								特色文旅
 							</view>
@@ -119,253 +108,179 @@
 								热门景区，当地文化
 							</view>
 						</view> -->
-            <image src="@/static/images/f2.png" mode="aspectFit"></image>
-          </view>
-        </view>
-      </view>
-      <view class="list-bon">
-        <image src="@/static/images/f4.png" mode="aspectFit"></image>
-      </view>
-      <view class="goodslist">
-        <WaterfallsFlow :wfList="cateGoods" />
-      </view>
-      <view class="empty_wrapper" v-if="emptyShow">
-        <u-empty
-          :show="emptyShow"
-          mode="list"
-          icon="http://cdn.uviewui.com/uview/empty/list.png"
-        ></u-empty>
-      </view>
-    </view>
+						<image src="@/static/images/f2.png" mode="aspectFit"></image>
+					</view>
+				</view>
+			</view>
+			<view class="list-bon">
+				<image src="@/static/images/f4.png" mode="aspectFit"></image>
+			</view>
+			<view class="goodslist">
+				<WaterfallsFlow :wfList="cateGoods" />
+			</view>
+			<view class="empty_wrapper" v-if="emptyShow">
+				<u-empty :show="emptyShow" mode="list" icon="http://cdn.uviewui.com/uview/empty/list.png"></u-empty>
+			</view>
+		</view>
 
-    <u-picker
-      :defaultIndex="[0, 0]"
-      :show="showPicker"
-      ref="uPicker"
-      :columns="columnData"
-      @confirm="confirm"
-      @cancel="showPicker = false"
-      @change="changeHandler"
-      keyName="name"
-    ></u-picker>
-    <u-loadmore :status="status" v-if="cateGoods.length >= where.limit" />
+		<u-picker :defaultIndex="[0, 0]" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm"
+			@cancel="showPicker = false" @change="changeHandler" keyName="name"></u-picker>
+		<u-loadmore :status="status" v-if="cateGoods.length >= where.limit" />
 
-    <view class="location" v-if="isshow">
-      <view class="locationa"> 位置权限使用说明 </view>
-      <view class="locationb"> 用于向你推荐最近门店 </view>
-    </view>
-  </view>
+		<view class="location" v-if="isshow">
+			<view class="locationa"> 位置权限使用说明 </view>
+			<view class="locationb"> 用于向你推荐最近门店 </view>
+		</view>
+	</view>
 </template>
 
 <script>
-import mTabbar from '@/components/m-tabbar/m-tabbar.vue'
-import zbpSwiper from '@/components/zbpSwiper'
-import easyLoadimage from '@/components/easy-loadimage/easy-loadimage.vue';
-import WaterfallsFlow from '@/components/WaterfallsFlow/WaterfallsFlowo.vue'
-import Cache from '@/utils/cache';
-import {
-	getSlideAPI
-} from '@/api/lihai.js'
-import {
-	graphicLstApi,
-	getTopicList,
-	graphicStartApi
-} from '@/api/community.js'
-import {
-	getIndexData,
-	getDiy,
+	import mTabbar from '@/components/m-tabbar/m-tabbar.vue'
+	import zbpSwiper from '@/components/zbpSwiper'
+	import easyLoadimage from '@/components/easy-loadimage/easy-loadimage.vue';
+	import WaterfallsFlow from '@/components/WaterfallsFlow/WaterfallsFlowo.vue'
+	import Cache from '@/utils/cache';
+	import {
+		getSlideAPI
+	} from '@/api/lihai.js'
+	import {
+		graphicLstApi,
+		getTopicList,
+		graphicStartApi
+	} from '@/api/community.js'
+	import {
+		getIndexData,
+		getDiy,
 
-} from '@/api/api.js'
+	} from '@/api/api.js'
 
-import {
-	spuInfo
-} from '@/api/product.js';
-import {
-	getGeocoder,
-	merClassifly,
-	getProductHot
-} from '@/api/store.js';
-import {
-	getArea,
-	getStreet
-} from '@/api/article.js';
-import {
-	Toast
-} from '@/libs/uniApi'
-export default {
-	components: {
-		mTabbar,
-		zbpSwiper,
-		easyLoadimage,
-		WaterfallsFlow
-	},
-	data() {
-		return {
-			activeStyle: {
+	import {
+		spuInfo
+	} from '@/api/product.js';
+	import {
+		getGeocoder,
+		merClassifly,
+		getProductHot
+	} from '@/api/store.js';
+	import {
+		getArea,
+		getStreet
+	} from '@/api/article.js';
+	import {
+		Toast
+	} from '@/libs/uniApi'
+	export default {
+		components: {
+			mTabbar,
+			zbpSwiper,
+			easyLoadimage,
+			WaterfallsFlow
+		},
+		data() {
+			return {
+				activeStyle: {
 
-				color: '#333333',
-				fontWeight: 'bold',
-				transform: 'scale(1.04)'
-			},
-			isshow: false,
-			locationArr: ({}),
-			status: 'loadmore',
-			bgColor: '',
-			showPicker: false,
-			columnData: [],
-			show: false,
-			tabsData: {
-				list: [],
-				tabsActive: 0
-			},
-			tabsData1: {
-				list: [],
-				tabsActive: 0
-			},
-			where: {
-				category_id: 0,
-				page: 1,
-				limit: 6
-			},
-	
-			currentItemId: 69, // 默认获取 社区的数据 0 表示推荐 || 69 社区
-			keyword: '',
-			location: '',
-			emptyShow: false,
-			town: '',
-			cateGoods: [],
-			recoList: [],
-			articleList: [],
-			street_id: '',
-			street: '',
-			bgColor: '',
-			isFshow: false,
-			backColor: 'rgba(252, 252, 252, 0)'
-		}
-	},
+					color: '#333333',
+					fontWeight: 'bold',
+					transform: 'scale(1.04)'
+				},
+				isshow: false,
+				locationArr: ({}),
+				status: 'loadmore',
+				bgColor: '',
+				showPicker: false,
+				columnData: [],
+				show: false,
+				tabsData: {
+					list: [],
+					tabsActive: 0
+				},
+				tabsData1: {
+					list: [],
+					tabsActive: 0
+				},
+				where: {
+					category_id: 0,
+					page: 1,
+					limit: 6
+				},
 
-	onPullDownRefresh() {
-		this.cateGoods = []
-		this.list()
-		this.Area()
-		uni.stopPullDownRefresh()
-	},
-
-	onLoad() {
-		this.list()
-
-		this.Area()
-
-
-		// this.openTongZhi()
-		uni.$on('connectstatusChange', (connectstatus) => {
-			var connectstr = ''
-			if (connectstatus == true) {
-				connectstr = '已连接'
-				this.getRegistrationID()
-			} else {
-				connectstr = '未连接'
+				currentItemId: 69, // 默认获取 社区的数据 0 表示推荐 || 69 社区
+				keyword: '',
+				location: '',
+				emptyShow: false,
+				town: '',
+				cateGoods: [],
+				recoList: [],
+				articleList: [],
+				street_id: '',
+				street: '',
+				bgColor: '',
+				isFshow: false,
+				backColor: 'rgba(252, 252, 252, 0)'
 			}
-			this.connectstatus = connectStr
-		})
+		},
 
-	},
+		onPullDownRefresh() {
+			this.cateGoods = []
+			this.list()
+			this.Area()
+			uni.stopPullDownRefresh()
+		},
 
-	onReachBottom() {
-		if (this.status == 'nomore') return;
-		this.status = 'loading';
-		this.where.page = ++this.where.page;
-	
-		this.list()
-	},
-	mounted() {
+		onLoad() {
+			this.list()
 
-		// #ifdef  H5
-		// 监听页面滚动事件
-		window.addEventListener("scroll", this.scrolling);
-		// #endif
-
-		this.$bus.$on('value-updated', (newValue) => {
-			// 更新父组件的值
-			this.street = newValue.split(',')[0]
-			this.town = newValue.split(',')[0]
-			this.street_id = newValue.split(',')[1]
-		});
+			this.Area()
 
 
-
-		if (this.street.length <= 0) {
-			this.selfLocation()
-		}
-
-	},
-
-	// #ifdef APP-PLUS
-	onPageScroll(e) {
-
-		const scrollTop = e.scrollTop;
-		if (scrollTop <= 20) {
-			this.backColor = 'rgba(252, 252, 252, 0)'
-			this.isFshow = false
-		} else if (20 < scrollTop && scrollTop <= 100) {
-			this.backColor = 'rgba(252, 252, 252, .5)'
-			this.isFshow = true
-		} else if (scrollTop > 100) {
-			this.backColor = 'rgba(252, 252, 252, 1)'
-			this.isFshow = true
-
-
-		}
-	},
-	// #endif
-
-	methods: {
-		navaction(val) {
-			uni.navigateTo({
-				url: '/pages/nongKe/supply_chain/suppliers?id=' + val
+			// this.openTongZhi()
+			uni.$on('connectstatusChange', (connectstatus) => {
+				var connectstr = ''
+				if (connectstatus == true) {
+					connectstr = '已连接'
+					this.getRegistrationID()
+				} else {
+					connectstr = '未连接'
+				}
+				this.connectstatus = connectStr
 			})
 
 		},
-		//获取商品列表
-		list(id) {
-			if (id) {
-				spuInfo(id, this.where1).then(res => {
-					this.cateGoods.push(...res.data.list)
-				})
-			} else {
-				getProductHot(this.where.page,this.where.limit).then(res => {
-					this.cateGoods.push(...res.data.list)
-				})
-			}
 
+		onReachBottom() {
+			if (this.status == 'nomore') return;
+			this.status = 'loading';
+			this.where.page = ++this.where.page;
+
+			this.list()
+		},
+		mounted() {
+
+			// #ifdef  H5
+			// 监听页面滚动事件
+			window.addEventListener("scroll", this.scrolling);
+			// #endif
+
+			this.$bus.$on('value-updated', (newValue) => {
+				// 更新父组件的值
+				this.street = newValue.split(',')[0]
+				this.town = newValue.split(',')[0]
+				this.street_id = newValue.split(',')[1]
+			});
+
+
+
+			if (this.street.length <= 0) {
+				this.selfLocation()
+			}
 
 		},
-		scrolling() {
-			// 滚动条距文档顶部的距离
-			let scrollTop =
-				window.pageYOffset ||
-				document.documentElement.scrollTop ||
-				document.body.scrollTop;
-			// 滚动条滚动的距离
-			let scrollStep = scrollTop - this.oldScrollTop;
-			// console.log("header 滚动距离 ", scrollTop);
-			// 更新——滚动前，滚动条距文档顶部的距离
-			this.oldScrollTop = scrollTop;
-
-			//变量windowHeight是可视区的高度
-			let windowHeight =
-				document.documentElement.clientHeight || document.body.clientHeight;
-			//变量scrollHeight是滚动条的总高度
-			let scrollHeight =
-				document.documentElement.scrollHeight || document.body.scrollHeight;
-
-			//滚动条到底部的条件
-			if (scrollTop + windowHeight == scrollHeight) {
-				//你想做的事情
-				// console.log("header  你已经到底部了");
-			}
 
+		// #ifdef APP-PLUS
+		onPageScroll(e) {
 
+			const scrollTop = e.scrollTop;
 			if (scrollTop <= 20) {
 				this.backColor = 'rgba(252, 252, 252, 0)'
 				this.isFshow = false
@@ -378,579 +293,641 @@ export default {
 
 
 			}
-
-
 		},
+		// #endif
+
+		methods: {
+			navaction(val) {
+				uni.navigateTo({
+					url: '/pages/nongKe/supply_chain/suppliers?id=' + val
+				})
+
+			},
+			//获取商品列表
+			list(id) {
+				if (id) {
+					spuInfo(id, this.where1).then(res => {
+						this.cateGoods.push(...res.data.list)
+					})
+				} else {
+					getProductHot(this.where.page, this.where.limit).then(res => {
+						this.cateGoods.push(...res.data.list)
+					})
+				}
+
+
+			},
+			scrolling() {
+				// 滚动条距文档顶部的距离
+				let scrollTop =
+					window.pageYOffset ||
+					document.documentElement.scrollTop ||
+					document.body.scrollTop;
+				// 滚动条滚动的距离
+				let scrollStep = scrollTop - this.oldScrollTop;
+				// console.log("header 滚动距离 ", scrollTop);
+				// 更新——滚动前，滚动条距文档顶部的距离
+				this.oldScrollTop = scrollTop;
+
+				//变量windowHeight是可视区的高度
+				let windowHeight =
+					document.documentElement.clientHeight || document.body.clientHeight;
+				//变量scrollHeight是滚动条的总高度
+				let scrollHeight =
+					document.documentElement.scrollHeight || document.body.scrollHeight;
+
+				//滚动条到底部的条件
+				if (scrollTop + windowHeight == scrollHeight) {
+					//你想做的事情
+					// console.log("header  你已经到底部了");
+				}
+
+
+				if (scrollTop <= 20) {
+					this.backColor = 'rgba(252, 252, 252, 0)'
+					this.isFshow = false
+				} else if (20 < scrollTop && scrollTop <= 100) {
+					this.backColor = 'rgba(252, 252, 252, .5)'
+					this.isFshow = true
+				} else if (scrollTop > 100) {
+					this.backColor = 'rgba(252, 252, 252, 1)'
+					this.isFshow = true
+
+
+				}
+
+
+			},
 
 
 
 
 
 
-		getCloudShopMerId(id) {
-			get_cloud_shop(id).then(res => {
-				res.data.length > 0 ? this.isYunCang = 1 : this.isYunCang = 0
-			})
-		},
-		selectLocation() {
+			getCloudShopMerId(id) {
+				get_cloud_shop(id).then(res => {
+					res.data.length > 0 ? this.isYunCang = 1 : this.isYunCang = 0
+				})
+			},
+			selectLocation() {
 
-			this.showPicker = true
-		},
-		confirm(e) {
+				this.showPicker = true
+			},
+			confirm(e) {
 
-			this.street = e.value[1].name
-			this.street_id = e.value[1].code
-			this.town = e.value[1].name
+				this.street = e.value[1].name
+				this.street_id = e.value[1].code
+				this.town = e.value[1].name
 
-			this.$nextTick(() => {
-				this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code);
+				this.$nextTick(() => {
+					this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code);
 
-			})
-			this.showPicker = false
-		},
-		changeHandler(e) {
-			const {
-				columnIndex,
-				value,
-				values,
-				index,
-				picker = this.$refs.uPicker
-			} = e;
-			if (columnIndex === 0) {
+				})
+				this.showPicker = false
+			},
+			changeHandler(e) {
+				const {
+					columnIndex,
+					value,
+					values,
+					index,
+					picker = this.$refs.uPicker
+				} = e;
+				if (columnIndex === 0) {
+					getStreet({
+						area_code: value[0]['code']
+					}).then(res => {
+						this.$refs.uPicker.setColumnValues(1, res.data);
+					});
+				}
+			},
+			Area() {
+				getArea({
+					city_code: 510500
+				}).then(res => {
+					this.$refs.uPicker.setColumnValues(0, res.data);
+					this.Street(res.data[0]['code']);
+				});
+			},
+			Street(code) {
 				getStreet({
-					area_code: value[0]['code']
+					area_code: code
 				}).then(res => {
 					this.$refs.uPicker.setColumnValues(1, res.data);
 				});
-			}
-		},
-		Area() {
-			getArea({
-				city_code: 510500
-			}).then(res => {
-				this.$refs.uPicker.setColumnValues(0, res.data);
-				this.Street(res.data[0]['code']);
-			});
-		},
-		Street(code) {
-			getStreet({
-				area_code: code
-			}).then(res => {
-				this.$refs.uPicker.setColumnValues(1, res.data);
-			});
-		},
-		gogogo(item) {
-			if (item.video_link.length > 0) {
+			},
+			gogogo(item) {
+				if (item.video_link.length > 0) {
 
-				uni.navigateTo({
-					// #ifdef MP || H5
-					url: `/pages/short_video/nvueSwiper/index?id=${item.community_id}`
-					// #endif
-					// #ifdef APP
-					url: `/pages/short_video/appSwiper/index?id=${item.community_id}`
-					// #endif
-				})
-
-			} else {
-				uni.navigateTo({
-
-					url: `/pages/plantGrass/plant_detail/index?id=${item.community_id}`
-				})
-			}
-		},
-		giveStart(item) {
-			let status = item.relevance_id ? 0 : 1
-			graphicStartApi(item.community_id, {
-				status: status
-			}).then(res => {
-				if (item.relevance_id) {
-					item.count_start--;
-					item.count_start = item.count_start == 0 ? 0 : item.count_start
-					item.relevance_id = false
-				} else {
-					item.count_start++;
-					item.relevance_id = true
-				}
-			})
-		},
-		go_shop() {
-			if (this.isYunCang == 0) {
-				return Toast('当前区域没有云仓库')
-			}
-			uni.navigateTo({
-				url: `/pages/nongKe/cloud_entrepot/index?street=${this.street_id}&town=${this.town}`
-			})
-
-		},
-		navgo(url) {
-			uni.navigateTo({
-				url
-			})
-		},
-		dchange(e) {
-			this.street = e.value[1].name
-			this.street_id = e.value[1].code
-			this.town = e.value[1].name
-		},
-		selfLocation() {
-			if (uni.getStorageSync('loction') == true) {
-				this.isshow = false
-			} else {
-				this.isshow = true
-				uni.setStorageSync('loction', true);
-			}
-			uni.getLocation({
-				type: 'wgs84',
-				timeout: '10',
-				success: (res) => {
-
-					this.isshow = false
-					let latitude, longitude;
-					latitude = res.latitude.toString();
-					longitude = res.longitude.toString();
-					getGeocoder({
-						lat: latitude,
-						long: longitude
-					}).then(res => {
-						this.town = res.data.address_reference.town.title
-						this.street_id = res.data.address_reference.town.id
-						this.street = res.data.address_component.street
-						this.$nextTick(() => {
-							this.$bus.$emit('value-updated', this.street + ',' + this
-								.street_id);
-
-						})
-						this.list(this.street_id)
-					}).catch(err => {
-						uni.showToast({
-							title: err,
-							icon: 'none'
-						})
+					uni.navigateTo({
+						// #ifdef MP || H5
+						url: `/pages/short_video/nvueSwiper/index?id=${item.community_id}`
+						// #endif
+						// #ifdef APP
+						url: `/pages/short_video/appSwiper/index?id=${item.community_id}`
+						// #endif
+					})
+
+				} else {
+					uni.navigateTo({
+
+						url: `/pages/plantGrass/plant_detail/index?id=${item.community_id}`
 					})
-				},
-				fail: (err) => {
-					this.isshow = false
-					// uni.showToast({
-					// 	title: "获取定位超时",
-					// 	icon: 'none',
-					// 	duration: 2000
-					// });
 				}
-			});
-		},
+			},
+			giveStart(item) {
+				let status = item.relevance_id ? 0 : 1
+				graphicStartApi(item.community_id, {
+					status: status
+				}).then(res => {
+					if (item.relevance_id) {
+						item.count_start--;
+						item.count_start = item.count_start == 0 ? 0 : item.count_start
+						item.relevance_id = false
+					} else {
+						item.count_start++;
+						item.relevance_id = true
+					}
+				})
+			},
+			go_shop() {
+				if (this.isYunCang == 0) {
+					return Toast('当前区域没有云仓库')
+				}
+				uni.navigateTo({
+					url: `/pages/nongKe/cloud_entrepot/index?street=${this.street_id}&town=${this.town}`
+				})
+
+			},
+			navgo(url) {
+				uni.navigateTo({
+					url
+				})
+			},
+			dchange(e) {
+				this.street = e.value[1].name
+				this.street_id = e.value[1].code
+				this.town = e.value[1].name
+			},
+			selfLocation() {
+				if (uni.getStorageSync('loction') == true) {
+					this.isshow = false
+				} else {
+					this.isshow = true
+					uni.setStorageSync('loction', true);
+				}
+				uni.getLocation({
+					type: 'wgs84',
+					timeout: '10',
+					success: (res) => {
+
+						this.isshow = false
+						let latitude, longitude;
+						latitude = res.latitude.toString();
+						longitude = res.longitude.toString();
+						getGeocoder({
+							lat: latitude,
+							long: longitude
+						}).then(res => {
+							this.town = res.data.address_reference.town.title
+							this.street_id = res.data.address_reference.town.id
+							this.street = res.data.address_component.street
+							this.$nextTick(() => {
+								this.$bus.$emit('value-updated', this.street + ',' + this
+									.street_id);
+
+							})
+							this.list(this.street_id)
+						}).catch(err => {
+							uni.showToast({
+								title: err,
+								icon: 'none'
+							})
+						})
+					},
+					fail: (err) => {
+						this.isshow = false
+						// uni.showToast({
+						// 	title: "获取定位超时",
+						// 	icon: 'none',
+						// 	duration: 2000
+						// });
+					}
+				});
+			},
 
 
 
+		}
 	}
-}
 </script>
 
 <style lang="scss" scoped>
-/deep/.color-lump {
-  display: none;
-}
+	/deep/.color-lump {
+		display: none;
+	}
 
-page {
-  background: #f4f7fe;
+	page {
+		background: #f4f7fe;
 
-  // background: linear-gradient(180deg, #FFFFFF 0%, #F6F6F6 100%);
-}
+		// background: linear-gradient(180deg, #FFFFFF 0%, #F6F6F6 100%);
+	}
 
-.location {
-  background-color: #f6f6f6;
-  width: 680rpx;
-  height: 150rpx;
-  position: absolute;
-  top: 0;
-  z-index: 9999;
-  border-radius: 20rpx;
-  left: 50%;
-  margin-left: -340rpx;
-  margin-top: 80rpx;
-  padding-left: 20rpx;
+	.location {
+		background-color: #f6f6f6;
+		width: 680rpx;
+		height: 150rpx;
+		position: absolute;
+		top: 0;
+		z-index: 9999;
+		border-radius: 20rpx;
+		left: 50%;
+		margin-left: -340rpx;
+		margin-top: 80rpx;
+		padding-left: 20rpx;
 
-  .locationa {
-    font-size: 28rpx;
-    color: #000;
-    font-weight: 500;
-    margin-top: 30rpx;
-    margin-bottom: 15rpx;
-  }
+		.locationa {
+			font-size: 28rpx;
+			color: #000;
+			font-weight: 500;
+			margin-top: 30rpx;
+			margin-bottom: 15rpx;
+		}
 
-  .locationb {
-    font-size: 20rpx;
-    color: #5a5a5a;
-  }
-}
+		.locationb {
+			font-size: 20rpx;
+			color: #5a5a5a;
+		}
+	}
 
-.Circle_friends {
-  position: relative;
-  padding: 0 0 87.72rpx 0;
-}
+	.Circle_friends {
+		position: relative;
+		padding: 0 0 87.72rpx 0;
+	}
 
-.sitebox {
-  animation-name: fadeIn;
-  animation-duration: 3s;
-  animation-fill-mode: forwards;
-}
+	.sitebox {
+		animation-name: fadeIn;
+		animation-duration: 3s;
+		animation-fill-mode: forwards;
+	}
 
-@keyframes fadeIn {
-  from {
-    opacity: 0;
-  }
+	@keyframes fadeIn {
+		from {
+			opacity: 0;
+		}
 
-  to {
-    opacity: 1;
-  }
-}
+		to {
+			opacity: 1;
+		}
+	}
 
-.site-box {
-  width: 100%;
-  /* #ifdef MP || APP-PLUS */
-  height: 160rpx;
-  /* #endif */
-  /* #ifdef H5 */
-  height: 120rpx;
-  /* #endif */
-  margin-bottom: 26.32rpx;
-  position: absolute;
-  top: 0rpx;
-  position: fixed;
-  z-index: 999;
-  /* #ifdef MP || APP-PLUS */
-  padding-top: 75rpx;
-  /* #endif */
-  /* #ifdef H5 */
-  padding-top: 25rpx;
-  /* #endif */
-  // background-color: #e5e5e5;
+	.site-box {
+		width: 100%;
+		/* #ifdef MP || APP-PLUS */
+		height: 160rpx;
+		/* #endif */
+		/* #ifdef H5 */
+		height: 120rpx;
+		/* #endif */
+		margin-bottom: 26.32rpx;
+		position: absolute;
+		top: 0rpx;
+		position: fixed;
+		z-index: 999;
+		/* #ifdef MP || APP-PLUS */
+		padding-top: 75rpx;
+		/* #endif */
+		/* #ifdef H5 */
+		padding-top: 25rpx;
+		/* #endif */
+		// background-color: #e5e5e5;
 
-  padding-right: 20rpx;
+		padding-right: 20rpx;
 
-  // 位置
-  .place_wrapper {
-    color: #fff;
-    margin-right: 24.56rpx;
-    font-size: 30rpx;
+		// 位置
+		.place_wrapper {
+			color: #fff;
+			margin-right: 24.56rpx;
+			font-size: 30rpx;
 
-    opacity: 0;
+			opacity: 0;
 
-    .town_name {
-      margin-left: 21rpx;
-    }
-  }
+			.town_name {
+				margin-left: 21rpx;
+			}
+		}
 
-  .iconfont {
-    opacity: 0;
-    font-size: 30rpx;
-    font-size: 35.09rpx;
-  }
-}
+		.iconfont {
+			opacity: 0;
+			font-size: 30rpx;
+			font-size: 35.09rpx;
+		}
+	}
 
-.circle_friends_wrapper {
-  position: relative;
+	.circle_friends_wrapper {
+		position: relative;
 
-  z-index: 2;
-}
+		z-index: 2;
+	}
 
-/deep/.u-tabs__wrapper__nav__line {
-  width: 46rpx;
-}
+	/deep/.u-tabs__wrapper__nav__line {
+		width: 46rpx;
+	}
 
-/deep/.u-tabs__wrapper__nav__item {
-  padding: 0 0px;
-  padding-right: 10rpx;
-}
+	/deep/.u-tabs__wrapper__nav__item {
+		padding: 0 0px;
+		padding-right: 10rpx;
+	}
 
-.search_wrapper {
-  width: 694.74rpx;
-  margin: 0 auto;
-}
+	.search_wrapper {
+		width: 694.74rpx;
+		margin: 0 auto;
+	}
 
-.tabs_wrapper {
-  width: 720rpx;
-  margin: 0 auto;
-  margin-bottom: 21.05rpx;
-  // margin-left: -20rpx;
-}
+	.tabs_wrapper {
+		width: 720rpx;
+		margin: 0 auto;
+		margin-bottom: 21.05rpx;
+		// margin-left: -20rpx;
+	}
 
-.empty_wrapper {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
+	.empty_wrapper {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
 
-.article_box {
-  height: 100%;
-  width: 694.74rpx;
-  margin: 0 auto;
-  background-color: #fff;
-  border-radius: 16rpx;
-  padding: 0 24.56rpx;
-  box-sizing: border-box;
+	.article_box {
+		height: 100%;
+		width: 694.74rpx;
+		margin: 0 auto;
+		background-color: #fff;
+		border-radius: 16rpx;
+		padding: 0 24.56rpx;
+		box-sizing: border-box;
 
-  .title-box {
-    height: 87.72rpx;
+		.title-box {
+			height: 87.72rpx;
 
-    text {
-      font-size: 28.07rpx;
-    }
-  }
+			text {
+				font-size: 28.07rpx;
+			}
+		}
 
-  .article-item {
-    display: flex;
-    // height: 175.44rpx;
-    justify-content: space-between;
-    border-bottom: 1px solid #f0f0f0;
-    padding: 21.05rpx 0;
+		.article-item {
+			display: flex;
+			// height: 175.44rpx;
+			justify-content: space-between;
+			border-bottom: 1px solid #f0f0f0;
+			padding: 21.05rpx 0;
 
-    .text {
-      flex: 1;
-      height: 122.81rpx;
-      margin-right: 17.54rpx;
-      font-size: 24rpx;
-      color: #999;
-      display: flex;
-      flex-direction: column;
-      justify-content: space-between;
+			.text {
+				flex: 1;
+				height: 122.81rpx;
+				margin-right: 17.54rpx;
+				font-size: 24rpx;
+				color: #999;
+				display: flex;
+				flex-direction: column;
+				justify-content: space-between;
 
-      .name {
-        font-size: 26.32rpx;
-        color: #282828;
-      }
-    }
+				.name {
+					font-size: 26.32rpx;
+					color: #282828;
+				}
+			}
 
-    .pictrue {
-      width: 175.44rpx;
-      height: 122.81rpx;
+			.pictrue {
+				width: 175.44rpx;
+				height: 122.81rpx;
 
-      image {
-        width: 100%;
-        height: 100%;
-        border-radius: 8px;
-      }
-    }
-  }
-}
+				image {
+					width: 100%;
+					height: 100%;
+					border-radius: 8px;
+				}
+			}
+		}
+	}
 
-.tabs_wrapper {
-  width: 723rpx;
-  margin: 0rpx auto;
-  margin-bottom: 21.05rpx;
+	.tabs_wrapper {
+		width: 723rpx;
+		margin: 0rpx auto;
+		margin-bottom: 21.05rpx;
 
-  .title {
-    font-size: 31.58rpx;
-    font-weight: bold;
+		.title {
+			font-size: 31.58rpx;
+			font-weight: bold;
 
-    &::before {
-      content: "";
-      display: inline-block;
-      width: 3px;
-      height: 31.58rpx;
-      background-color: #f84221;
-      margin-right: 7.02rpx;
-    }
-  }
-}
+			&::before {
+				content: "";
+				display: inline-block;
+				width: 3px;
+				height: 31.58rpx;
+				background-color: #f84221;
+				margin-right: 7.02rpx;
+			}
+		}
+	}
 
-.list {
-  display: flex;
-  padding: 12rpx;
-  justify-content: space-between;
+	.list {
+		display: flex;
+		padding: 12rpx;
+		justify-content: space-between;
 
-  .list-m {
-    width: 356rpx;
-    height: 235rpx;
-    position: relative;
+		.list-m {
+			width: 356rpx;
+			height: 235rpx;
+			position: relative;
 
-    .list-title {
-      display: flex;
-      position: absolute;
-      top: 20rpx;
+			.list-title {
+				display: flex;
+				position: absolute;
+				top: 20rpx;
 
-      .list-titlea {
-        margin-left: 14rpx;
-        width: 96rpx;
-        height: 117rpx;
-        margin-right: 11rpx;
-        position: relative;
+				.list-titlea {
+					margin-left: 14rpx;
+					width: 96rpx;
+					height: 117rpx;
+					margin-right: 11rpx;
+					position: relative;
 
-        .titlea-con {
-          position: absolute;
-          top: 20rpx;
-          color: #f4f7fe;
+					.titlea-con {
+						position: absolute;
+						top: 20rpx;
+						color: #f4f7fe;
 
-          .titlea {
-            margin-top: 12rpx;
-            margin-left: 12rpx;
-            font-size: 16rpx;
-            font-family: PingFang SC-Semibold, PingFang SC;
-          }
+						.titlea {
+							margin-top: 12rpx;
+							margin-left: 12rpx;
+							font-size: 16rpx;
+							font-family: PingFang SC-Semibold, PingFang SC;
+						}
 
-          .titleb {
-            margin-top: 6rpx;
-            font-size: 37rpx;
-            font-family: PingFang SC-Semibold, PingFang SC;
-            font-weight: 600;
-            color: #ffffff;
-            margin-left: 20rpx;
-          }
-        }
+						.titleb {
+							margin-top: 6rpx;
+							font-size: 37rpx;
+							font-family: PingFang SC-Semibold, PingFang SC;
+							font-weight: 600;
+							color: #ffffff;
+							margin-left: 20rpx;
+						}
+					}
 
-        image {
-          width: 100%;
-          height: 100%;
-        }
-      }
+					image {
+						width: 100%;
+						height: 100%;
+					}
+				}
 
-      .list-titleb {
-        .titlea {
-          font-size: 37rpx;
-          font-family: PingFang SC-Semibold, PingFang SC;
-          font-weight: 600;
-          color: #ffffff;
-          margin-top: 10rpx;
-        }
+				.list-titleb {
+					.titlea {
+						font-size: 37rpx;
+						font-family: PingFang SC-Semibold, PingFang SC;
+						font-weight: 600;
+						color: #ffffff;
+						margin-top: 10rpx;
+					}
 
-        .titleb {
-          font-size: 33rpx;
-          font-family: PingFang SC-Medium, PingFang SC;
-          font-weight: 500;
-          color: #ffffff;
-        }
-      }
-    }
+					.titleb {
+						font-size: 33rpx;
+						font-family: PingFang SC-Medium, PingFang SC;
+						font-weight: 500;
+						color: #ffffff;
+					}
+				}
+			}
 
-    .list-title-info {
-      // width: 98rpx;
-      height: 30rpx;
-      background: #ffffff;
-      padding: 2rpx 2rpx;
-      display: flex;
-      font-size: 10rpx;
-      font-size: 18rpx;
-      font-family: PingFang SC-Medium, PingFang SC;
-      font-weight: 500;
-      color: #ff6b00;
-      border-radius: 19rpx 19rpx 19rpx 19rpx;
-      position: absolute;
-      bottom: 14rpx;
-      left: 50%;
-      margin-left: -49rpx;
-      padding-left: 15rpx;
+			.list-title-info {
+				// width: 98rpx;
+				height: 30rpx;
+				background: #ffffff;
+				padding: 2rpx 2rpx;
+				display: flex;
+				font-size: 10rpx;
+				font-size: 18rpx;
+				font-family: PingFang SC-Medium, PingFang SC;
+				font-weight: 500;
+				color: #ff6b00;
+				border-radius: 19rpx 19rpx 19rpx 19rpx;
+				position: absolute;
+				bottom: 14rpx;
+				left: 50%;
+				margin-left: -49rpx;
+				padding-left: 15rpx;
 
-      .title-infoimg {
-        width: 18rpx;
-        height: 18rpx;
-        margin: auto 0;
+				.title-infoimg {
+					width: 18rpx;
+					height: 18rpx;
+					margin: auto 0;
 
-        image {
-          width: 100%;
-          height: 100%;
-        }
-      }
-    }
+					image {
+						width: 100%;
+						height: 100%;
+					}
+				}
+			}
 
-    image {
-      width: 100%;
-      height: 100%;
-    }
-  }
-}
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+	}
 
-.list-con {
-  display: flex;
-  justify-content: space-between;
-  margin-top: -10rpx;
-  padding: 12rpx;
+	.list-con {
+		display: flex;
+		justify-content: space-between;
+		margin-top: -10rpx;
+		padding: 12rpx;
 
-  .list-con-left {
-    width: 357rpx;
-    height: 482rpx;
-    position: relative;
+		.list-con-left {
+			width: 357rpx;
+			height: 482rpx;
+			position: relative;
 
-    .list-con-title {
-      position: absolute;
-      top: 0;
-      z-index: 10;
-      padding-left: 14rpx;
+			.list-con-title {
+				position: absolute;
+				top: 0;
+				z-index: 10;
+				padding-left: 14rpx;
 
-      .con-titlea {
-        font-size: 37rpx;
-        font-family: PingFang SC-Semibold, PingFang SC;
-        font-weight: 600;
-        color: #ffffff;
-        margin-top: 10rpx;
-      }
+				.con-titlea {
+					font-size: 37rpx;
+					font-family: PingFang SC-Semibold, PingFang SC;
+					font-weight: 600;
+					color: #ffffff;
+					margin-top: 10rpx;
+				}
 
-      .con-titleb {
-        margin-top: 5rpx;
-        font-size: 33rpx;
-        font-family: PingFang SC-Medium, PingFang SC;
-        font-weight: 500;
-        color: #ffffff;
-      }
-    }
+				.con-titleb {
+					margin-top: 5rpx;
+					font-size: 33rpx;
+					font-family: PingFang SC-Medium, PingFang SC;
+					font-weight: 500;
+					color: #ffffff;
+				}
+			}
 
-    image {
-      width: 100%;
-      height: 100%;
-    }
-  }
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
 
-  .list-con-right {
-    width: 356rpx;
+		.list-con-right {
+			width: 356rpx;
 
-    .con-right {
-      width: 356rpx;
-      height: 235rpx;
-      position: relative;
+			.con-right {
+				width: 356rpx;
+				height: 235rpx;
+				position: relative;
 
-      .list-con-title {
-        position: absolute;
-        top: 0;
-        z-index: 10;
-        padding-left: 14rpx;
+				.list-con-title {
+					position: absolute;
+					top: 0;
+					z-index: 10;
+					padding-left: 14rpx;
 
-        .con-titlea {
-          font-size: 37rpx;
-          font-family: PingFang SC-Semibold, PingFang SC;
-          font-weight: 600;
-          color: #ffffff;
-          margin-top: 10rpx;
-        }
+					.con-titlea {
+						font-size: 37rpx;
+						font-family: PingFang SC-Semibold, PingFang SC;
+						font-weight: 600;
+						color: #ffffff;
+						margin-top: 10rpx;
+					}
 
-        .con-titleb {
-          margin-top: 5rpx;
-          font-size: 33rpx;
-          font-family: PingFang SC-Medium, PingFang SC;
-          font-weight: 500;
-          color: #ffffff;
-        }
-      }
+					.con-titleb {
+						margin-top: 5rpx;
+						font-size: 33rpx;
+						font-family: PingFang SC-Medium, PingFang SC;
+						font-weight: 500;
+						color: #ffffff;
+					}
+				}
 
-      image {
-        width: 100%;
-        height: 100%;
-      }
-    }
-  }
-}
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+		}
+	}
 
-.list-bon {
-  width: 724rpx;
-  height: 128rpx;
-  margin: 0 auto;
-  margin-bottom: 12rpx;
+	.list-bon {
+		width: 724rpx;
+		height: 128rpx;
+		margin: 0 auto;
+		margin-bottom: 12rpx;
 
-  image {
-    width: 100%;
-    height: 100%;
-  }
-}
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
 
-.goodslist {
-  margin: 0 auto;
-  width: 725rpx;
-}
-</style>
+	.goodslist {
+		margin: 0 auto;
+		width: 725rpx;
+	}
+</style>
\ No newline at end of file

From 956dd1a5f68d78eec96d66e2f45a4f17cfbf6482 Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Tue, 5 Sep 2023 16:10:09 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E6=88=90=E5=8A=9Fapp=E6=98=BE=E7=A4=BA=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8Ctabar?=
 =?UTF-8?q?=E6=A0=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                             |  40 ++++++++++++++++++----------
 pages.json                          |  22 ++++++++++++---
 pages/index/index.vue               |  29 +++++++++++++++++---
 pages/users/order_confirm/index.vue |  40 +++++++++++++++-------------
 static/tabbar_icon/a-a.png          | Bin 2164 -> 3995 bytes
 static/tabbar_icon/a.png            | Bin 1744 -> 2080 bytes
 static/tabbar_icon/b-a.png          | Bin 1104 -> 4042 bytes
 static/tabbar_icon/b.png            | Bin 827 -> 2174 bytes
 static/tabbar_icon/c-a.png          | Bin 2385 -> 4914 bytes
 static/tabbar_icon/c.png            | Bin 2016 -> 1882 bytes
 static/tabbar_icon/d-2.png          | Bin 4051 -> 0 bytes
 static/tabbar_icon/d-a.png          | Bin 1461 -> 4335 bytes
 static/tabbar_icon/d.png            | Bin 1371 -> 4070 bytes
 static/tabbar_icon/e-a.png          | Bin 2320 -> 3867 bytes
 static/tabbar_icon/e.png            | Bin 1969 -> 2696 bytes
 15 files changed, 92 insertions(+), 39 deletions(-)
 delete mode 100644 static/tabbar_icon/d-2.png

diff --git a/App.vue b/App.vue
index e0645a9..87cb497 100644
--- a/App.vue
+++ b/App.vue
@@ -10,7 +10,7 @@
 	// +----------------------------------------------------------------------
 	// #ifdef APP-PLUS
 	let jpushModule = uni.requireNativePlugin("JG-JPush");
-  const mp = uni.requireNativePlugin('uniMP');
+	const mp = uni.requireNativePlugin('uniMP');
 	// #endif  
 	import {
 		checkLogin
@@ -76,19 +76,17 @@
 		onLaunch: function(option) {
 			this.globalData.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
 			this.globalData.uid = this.$store.state.app.uid;
-      
-      // #ifdef APP-PLUS
-      //监听uni小程序发送的事件
-      mp.onUniMPEventReceive(ret=>{
-      	console.log('小程序事件: ', ret);
-        if(ret.event=='closeApp'){
-          mp.closeUniMP(ret.fromAppid, (ret)=>{
-            console.log('closeUniMP: '+JSON.stringify(ret));
-          });
-        }
-      });
-      // #endif
-      
+
+			//监听uni小程序发送的事件
+			mp.onUniMPEventReceive(ret => {
+				console.log('小程序事件: ', ret);
+				if (ret.event == 'closeApp') {
+					mp.closeUniMP(ret.fromAppid, (ret) => {
+						console.log('closeUniMP: ' + JSON.stringify(ret));
+					});
+				}
+			});
+
 			let that = this;
 			// #ifdef MP
 			if (HTTP_REQUEST_URL == '') {
@@ -231,6 +229,20 @@
 			}, 1500)
 			// #endif	
 		},
+		mounted() {
+			uni.onTabBarMidButtonTap((e) => {
+				// console.log("点击了", e);
+				uni.switchTab({
+					url: '/pages/plant_release/index'
+				})
+				// uni.navigateTo({
+				// 		url: '/pages/plant_release/index'
+				// })
+
+			});
+			uni.setTabBarItem((e) => { console.log("点击了", e)});
+		},
+
 		methods: {
 			/**
 			 * 语音播报
diff --git a/pages.json b/pages.json
index 1142d9f..e2006d5 100644
--- a/pages.json
+++ b/pages.json
@@ -216,7 +216,7 @@
 						"navigationStyle": "custom"
 					}
 
-				}, 
+				},
 				{
 					"path": "supply_chain/suppliers",
 					"style": {
@@ -1497,6 +1497,7 @@
 		"selectedColor": "#E93323",
 		"borderStyle": "white",
 		"backgroundColor": "#ffffff",
+		"fontSize": "25rpx",
 		"list": [{
 				"pagePath": "pages/index/index",
 				"iconPath": "static/tabbar_icon/a.png",
@@ -1513,10 +1514,12 @@
 				"pagePath": "pages/plant_release/index",
 				"iconPath": "static/tabbar_icon/d.png",
 				"selectedIconPath": "static/tabbar_icon/d-a.png",
-				"text": "发布"
+				"text": "发布",
+			    "visible":false
 			},
 			{
 				"pagePath": "pages/supply_chains/supply_chains",
+				
 				"iconPath": "static/tabbar_icon/c.png",
 				"selectedIconPath": "static/tabbar_icon/c-a.png",
 				"text": "供应"
@@ -1527,7 +1530,20 @@
 				"selectedIconPath": "static/tabbar_icon/e-a.png",
 				"text": "我的"
 			}
-		]
+		],
+		"midButton": {
+			"width": "78rpx",
+			"height": "126rpx",
+			"iconWidth": "78rpx",
+			"pagePath": "pages/plant_release/index",
+			"iconPath": "static/tabbar_icon/d.png",
+			// "selectedIconPath": "static/tabbar_icon/d-a.png",
+			
+			"text": "发布"
+		}
+
+
+
 	},
 	"condition": { //模式配置，仅开发期间生效
 		"current": 0, //当前激活的模式(list 的索引项)
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 1ce2725..6917f14 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -186,7 +186,13 @@
 
 		},
 		onTabItemTap(e) {
-			console.log(e)
+			if (e.text.length>=4) {
+				uni.pageScrollTo({
+					selector: ".Circle_friends",
+					scrollTop: 0
+				})
+				
+			}
 		},
 		onReachBottom() {
 			if (this.status == 'nomore') return;
@@ -218,6 +224,12 @@
 				this.backColor = 'rgba(252, 252, 252, 0.0)'
 				this.isFshow = false
 				this.show = true
+				uni.setTabBarItem({
+					index: 0,
+					text: "泸州",
+					iconPath: '/static/tabbar_icon/a.png',
+					selectedIconPath: '/static/tabbar_icon/a-a.png'
+				});
 			} else if (20 < scrollTop && scrollTop <= 100) {
 				this.backColor = 'rgba(255, 255, 255, 0.5)'
 				this.isFshow = true
@@ -226,6 +238,12 @@
 				this.backColor = 'rgba(252, 252, 252, 1.0)'
 				this.isFshow = true
 				this.show = false
+				uni.setTabBarItem({
+					index: 0,
+					text: '返回顶部',
+					iconPath: '/static/tabbar_icon/top.png',
+					selectedIconPath: '/static/tabbar_icon/top.png'
+				});
 			}
 
 
@@ -263,6 +281,12 @@
 				if (scrollTop <= 20) {
 					this.backColor = 'rgba(252, 252, 252, 0.0)'
 					this.isFshow = false
+					uni.setTabBarItem({
+						index: 0,
+						text: "泸州",
+						iconPath: '/static/tabbar_icon/a.png',
+						selectedIconPath: '/static/tabbar_icon/a-a.png'
+					});
 				} else if (20 < scrollTop && scrollTop <= 100) {
 					this.backColor = 'rgba(255, 255, 255, 0.5)'
 					this.isFshow = true
@@ -272,8 +296,7 @@
 
 					uni.setTabBarItem({
 						index: 0,
-						text: '',
-				         id:'1',
+						text: '返回顶部',
 						iconPath: '/static/tabbar_icon/top.png',
 						selectedIconPath: '/static/tabbar_icon/top.png'
 					});
diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue
index 18ddaee..911d4ba 100644
--- a/pages/users/order_confirm/index.vue
+++ b/pages/users/order_confirm/index.vue
@@ -1301,6 +1301,7 @@
 									});
 								},
 								fail: (e) => {
+										console.log(e,'111111111')
 									// 暂不跳转
 									let url = '/pages/order_pay_status/index?order_id=' + orderId +
 										'&msg=取消支付' + '&product_type=' + that.product_type;
@@ -1311,16 +1312,17 @@
 										url: url
 									});
 								},
-								complete: () => {
+								complete: (res) => {
+								uni.hideLoading();
 									// 暂不跳转
-									let url = '/pages/order_pay_status/index?order_id=' + orderId +
-										'&msg=取消支付' + '&product_type=' + that.product_type;
-									return that.$util.Tips({
-										title: '取消支付',
-									}, {
-										tab: 4,
-										url: url
-									});
+									// let url = '/pages/order_pay_status/index?order_id=' + orderId +
+									// 	'&msg=取消支付' + '&product_type=' + that.product_type;
+									// return that.$util.Tips({
+									// 	title: '取消支付',
+									// }, {
+									// 	tab: 4,
+									// 	url: url
+									// });
 								},
 							});
 							// #endif
@@ -1414,17 +1416,17 @@
 								},
 								complete: () => {
 									uni.hideLoading();
-									// 暂不跳转
-									let pages = '/pages/order_pay_status/index?order_id=' +
-										orderId + '&msg=取消支付' + '&product_type=' + that
-										.product_type
+									// // 暂不跳转
+									// let pages = '/pages/order_pay_status/index?order_id=' +
+									// 	orderId + '&msg=取消支付' + '&product_type=' + that
+									// 	.product_type
 
-									return that.$util.Tips({
-										title: '取消支付'
-									}, {
-										tab: 5,
-										url: pages
-									});
+									// return that.$util.Tips({
+									// 	title: '取消支付'
+									// }, {
+									// 	tab: 5,
+									// 	url: pages
+									// });
 								},
 							});
 							break;
diff --git a/static/tabbar_icon/a-a.png b/static/tabbar_icon/a-a.png
index 89b7e432dd048b9130feff5c062a0fdae02f9e92..ae29eb198f23aa585320268096900f2c551f5311 100644
GIT binary patch
literal 3995
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
Bq5=Q_

literal 2164
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

diff --git a/static/tabbar_icon/a.png b/static/tabbar_icon/a.png
index ae60e2ceafd6820a7e0fc1a39698da6a43ce9428..dd9d6f337e1cb5f5c2a089e5a2c761ec2a927c6a 100644
GIT binary patch
literal 2080
zcmV+*2;cXKP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00001b5ch_0Itp)
z=>Px++DSw~RCr$Pn|*8?M-{-|o4xo0*NN2>C4X3u2;;yd+}+H!AVd&F3Mz;qsHiDP
zEYw0%8nqN60YaicDm9`&OM^gANCK^B1x+gysf8d&p{O8&%FOIth-=hJxWbe`V_YGc
zJ6pH&&`5XDdUNO9yFH)f)6ReA`FiiS@6Eh<Ge$_uvIH>Yvpj)S1+-(wj!k`ieRlxB
zHHbJ400aQjM0E1Pg$v)Fo}Qjt?GLzWfH>#3GRD3R0K<(S5YfCb=78sU53MGot^*ny
z8(Y6&!-iu3aD5!bjWG|+&(GgFGc!|()4tPfx(Y}L;UeOr0Puzu74e8@LMin^i~SNe
z?;0Q>#O(lZFCz8_r6!`6j4_`pm&;EK4h}j1FyT1PJpgcdNW1?M(M?LJpC#71g#lI^
zkael`>(?Je#EGz6M0BcJt?n(AO8*Ylan4`Q7&{ICZw<k;i}+!s)aL=9+Jc^KH(gOc
z`Fx%`j&mFl$3hbN#+bXb)`tMVG?G4>&Gz;8_aA1A?Qc;3hibKYL$O%=N86gm?6_ip
zIOqEj@&2$&0l>LxwYsNREdDl*jGXh`h<F4MheFo$G7;_8T0a$MoOauE9MHCH+lGgR
zhK@CHsi!QQuuDY=pU>yFJC5@hBEGqSB_6C<qIJKHmyQC8aH&ID>${q{RFr19Ty7|n
z$@~xzKhj_=JGrp1FnRXu+5be1(`tRk0NKC~5f3+Tsec(`_IAn@gb=p@z&8=GFXVDB
z+I6W^D*dTd2+Ork45;Q(c9&}OWq(ttRQ66yO`Yqc(79ahZJA8QF8;3zL0Uw_15(QG
zc51#vfNC!FC?dYG!P=0>rJ@wvzJ2@U{r&xqAmV!)xZLq-wfgZ=sq|{pI8pU&1FD^+
z?gxN@&?MHSCbib5q9*S^J#x;!$QU~a05-_HScvF3-}fhq#p2l{^Rx`8=2AaE#E*t2
zHpV>77~3PI{AUuOTJ6g@-^CdF2>@IXg7hj8?bBM@y0%J7fH>!QM6}!O5|<((8|-~m
zDfQ)ccd53d4|K}qa--|kt@|keyraQ~dthN<;nP!7Q;V(66C02a;ub{wR@kM8$OdeC
zy5v$(`elR=_X5Bjh`2;IBKos2X2SElnW#a6^^t(G+3aNl0|Pday~L%6=y!;?yW1`m
zr6A}0!;G;Xg>y}{9Mh!ddB2Dnqh22g$aP(NXl!)QJfxKR3IO<VC+lXrd_F&($z&b}
zfVYI!B|}8l#I^W1fb3TJn))QxrF`F?EEbEu>ZZc&%r!bXI=E@mrUwAvV<AXKlv20E
z88Z@)5aMA(+-nCTqTdtI4O;7$IOp#|MC<Q1?QpwNO2(ORrQ6gZZJT?VM#Ozm%Jbp%
z)A#)w<EC;W0lBWb&O$N9%zK{q^SXkr>)Ne+bM3b$rQ|EEeAM_th%rQbK49%OcXYu1
zwsin-9TELqYi)PCSS1orvr$~vU2=MsQno!-EJ<TDDijJ=JB|}fqdYC8e0PklO`Ei>
zR0=2pd#3<x*|KF|WMsr9^EV^n|9sz{ZTEQ4Qx;_N&H!+yjjs^#vd}IwV^b${b93Ks
z<+`V50NFqe5g!bLX<)Q}F~(f0wSF<qI?@w>3WdT49mhElN8wtV*>bsjRh*pCng^84
zW;YKE3_Rb!a%KVGG!a=>+u6Y7PAR3{69sk61LB+?VT|1zP_*j%{(jH%j@JKHC=^B*
zWA--W#vl-5%&w@k?OF$9PulZA>oCUb*IL`7z$HZp@oPlf6$ttsR7%~noE5EUK%Da{
z8Dq}|6r7b(Zf$l$>bmYu0C*+<=mn)zIJLWk*O~?-gt!(Fp9m=Yq*Cew%`C#kM;kY8
zEC=c<Qp&-ewV?3VwFh6N)H|CgJU%{t#qjX(%YpjyQp(r%GN3Jv<NPgX5#@4uYqRZ}
zbN&g&*u}-$W(1W|SM@9)tC$etIYfL@z|Br5rED^8$xDse>yFcbY=KR+98^l#o7tvi
zO|L;UK%Yd!CA*e&H2}C95l<UqM(jNoBHkUkp{OipZGjMB&7bD&R{uvtyfP~23&lWR
z&{}^js?VCYAgf?4ntrCio1td<AC*$>i-Ke8djgPE#C2VJ!S}t0hny8-%$-{6`{Kaq
zDL{3F^ZESFOeSOV-8+eB)aHYT$ezodtW+w;;v7(e@Os9A;#x$j?NUGy#8N;JfH>#Z
zGsYeZG<#f1dC8?`E0&ogX&=1yv4Py%l~OjiTeTvD_y!_=HV}w@M=ABGBm%V!NC@#`
zM4Su=W0P9%>(=|_u+p`AuV)c)q+aLy{&k+`wUWKOgk=&yHsU=Q9Fd5AS*=z-Q!17I
zn&hjs*f&!s6yEPRj*Zak7nyd5b8~ZZTU$x`H=4I?Kz1-8#K}fa-~eEjh`RC;9sum|
z<f7Hol{CiOthKiPG?S<#0#pn5Y*Opu0W^^`9qLR(k=e(%QzZgqC$UF|!NEcM#O><1
zldfPpYqj@CDZkXIIT8b^3sNW)KExQi4H0dsH2ko$Q}Q+&=R5$MSX^AZ@64Gq)192G
zV}OD}+4q8su}migU1qFTJkNV&rRG`@Kr1EeYK)r#ilCkXN&zKv%+!KX3ra008G+P-
zlJQH|pwxm=3ra>HwV-7D(lscxpwxnr5lAg48NYN5N-Zdv1^pku#KU$XYPbCW0000<
KMNUMnLSTZJNBm;|

literal 1744
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

diff --git a/static/tabbar_icon/b-a.png b/static/tabbar_icon/b-a.png
index c4777906f2aefb6f81a0c520adf26be82f0d073e..0a6a048991025f7f1fcebb9dc588098258911b79 100644
GIT binary patch
literal 4042
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

literal 1104
zcmV-W1h4yvP)<h;3K|Lk000e1NJLTq002Ay002A)1^@s6I{evk00001b5ch_0Itp)
z=>Px(3Q0skRA@u(nonpPRUF5^zqgz2R$CMC4{c+U3H0DW5z&La%{B@O6$;jakRI(S
zwWz2lcyI;59ux%;?M-L}p&kT<_8{E>dl3{o6xu^26WE}|g1gINW}D6X$|l65+1Z)5
z|7NCU=K6lWH{Z|u{ob43%=`q~?2>K9ixl|(9`Q87+d9IWoxI0e$sQ3U4+$`l#Kj=s
ziH0izXGhunIZR{Ml=kfD6A*O@f?Z*gBxaoWu|*!+<+y)#)8q@>JT(0-p*~0qNH0Rj
zt4qYeyB)Xc=hgx2*$*6mj9q~s+sl2DWvf5RUtD<02)Jom?@>u<voVPq0ydHbwMmVL
zwN>xV^89^9z}}&ma{!M1XG~oCgM4_#alNDh|6^OPDJ7q5)~EH&{dYKvm93gPQ@UW4
zA!2U;)5(|JLQ-Mdx|VFq7A56dqO3Wy({bGtc<TyyX@t|1PTY1*_b>paht^tR4(+kT
z60(>ae*~1_)ZUcer1*EuWdB5-(kvm*eG}&aY&^eBlm^>WMfjw=So<|>s>p#`UydJD
zO4=3LP%i<$mE*PN!zPU$_>0|#RVMR&n6O^Qg*Yq4>aj4t$bnb)@4kt11dfD>Gae`0
zn=SoR{zUy+m`~)u>w@_CoqM3h@?io^#^vQ|M;+YFFE(HkkWtvAz-i&Jkyk@2JVueK
zrgO%U(yJ%+-n$-yD6>P0tVpr;yD3zVUF5*4mDb+zpCIzMF#y>T;1wy>P8<7lF^n9z
z|4NHD)bX0{$F^P;A$s6`D=orR#p+BiaDKLt1Gh!+^u!qo=6VocUD5i5v6t!>dhqcz
zjRklOdiTB18MD{J>(z>s&>9rB?H?QPFvRyWM+%%)T4|-Vu>$Fbc%~oX`#DHQ>ND6W
z-TAw;l9S~p<YHxUq^bv)e95*x6eaI$p2GNdY16jerjk<w+~41oXh3*2r`?m{gcls1
zJ^cnmmHO&2Au9Ru{C+<n9q+>p+uD;AT!F|)x^_hCxtz1`b<l!(v(~GieA@4#i)Jb3
zxbGVQua#<3bD}b5`n_SGpVn{YorRCP*$fH`;!=+Dg>G3C(6%&n7@|JImi~!>7J;mi
zc+~IDe0$yjVcT{2S9RTZ{eI`KuKg&1t%tOcZDPtM#8OHo2Z5!=b&cg8{Q52eVTsEk
z_zs}&iv~3t8nUPXC#XMbU3(&WEt`eu=Lq#pN2?TZsm{hTK@saU2(bf43EN(rSb>)d
zQ?o0`T=0qP<vJS&hZ)&Kq_kJC&O_wsThfxe+9C=j`?1$_jy=MiO>m=yjUBjdTMzCK
zw4-d1_+^EBc2to~L`tuVSh6jv+q1c!v<>o!_0SqNjLCc{u*oXj&NgX;Z|CTlX#W>T
W>J@5bHd15&0000<MNUMnLSTYh<Sa=5

diff --git a/static/tabbar_icon/b.png b/static/tabbar_icon/b.png
index 4fb3ab90b92595f30f6aa85b26d7ed2beed45582..57ab44c7db1deffb7d477eb71d033595e7512271 100644
GIT binary patch
literal 2174
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
A<NyEw

literal 827
zcmV-B1H}A^P)<h;3K|Lk000e1NJLTq002Ay002A)1^@s6I{evk00001b5ch_0Itp)
z=>Px%^+`lQRA@u(S}|x8K@|OeHg}bUAc7!)6Fjic!p?LTY!nm(En_&iok=00qM~47
z1VIZ$!6xi(F`$BQjfJ3vkSo#%mVwBfMT!IzgiVn`c4faTB;?rJz1zDa?!^3UZ+7;*
z|NguWHxFT-J-E;K0u%n<6=#L_wZhZW(}&9C@+Bd}Ng_IEXfb{Rz%nAX9LM=G2xDeT
z+qQj82=NpE4h-7Fl;4Tya~OtKwbnnfFr^Y!N<9F8$EFY&634e72qv`FYiaNG5N<RY
z$1TfR0)Vk0KV-~uB6{Y!?%iC3l~NA@U^cP%7XYjq!>AWXC5hK@oWr>YODUU(cx7`j
z5q%HC@RZg%HU}dg+qQ2CAzpNYi=t@U^SqTL;GUM2QqCh{t&4EWb=^rLnQnlxZM!Cf
znD53I1i>+_^)eGqR)7^I;+8h;Jo6a_05+|Sw&bzIF3m1&nnwe$OS4OFbtStryEMBr
zyL90d;IYJGiO14b1$Zp+SSs9<djPOYvrDr}vrF^cl6l^|g=o7joxCnxu`KJ%+}zx%
zsic)sPXOTlsMn?U5HZen?DVrvL~lBs&h=KS^=HuLN~zl$7xSZJOjaDn8BhC0&tE+C
zdi_YLR9ZsBT}kZ_(Uj}DZ~GCJQr<wsmxGFu^?MXWv!3TY%0)O{WZU+X5aRWy9~|)B
z9mjE=XRX;TSpZmQx7(9hU6dJHl2Tqk#8&{2%ukG52O?Sv!|-(4&3wG+Hp#}vMEkyf
ztJ!R3=27}a4{NpBShZTMMNw3-EbHjVOaXw1eiG4#wA{r2vWrCY9uc$7ee4aZVHmdh
z<+C=i8<Dk?QeH;HcPUY+1>g72_fu?G5eg^#FUiKmDU|Tc%*<IL`jn#VqVM|?JE^P@
zEv=OL2mt32Z5c-gC-a=gVcWTIg_9vT0N7Qsg%egvodAGX<#_ac4T9j}ZYgU-OK*ax
z*Xxz6**r?y_IsyL)7oh=dG=$%d8)LR*RaBSS-m{i{{ptn*ju97_`3iA002ovPDHLk
FV1l(cjF|uc

diff --git a/static/tabbar_icon/c-a.png b/static/tabbar_icon/c-a.png
index c3501e38f91c39696b29e6122b94fd36cdc5b9b3..91ac11080eeed8522b1bf55c9e0bd8f63ec36a89 100644
GIT binary patch
literal 4914
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

literal 2385
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
D#<r2&

diff --git a/static/tabbar_icon/c.png b/static/tabbar_icon/c.png
index 8d184d30e5449da2b3d8b7548d89825e7b369c82..ff73369590029a59f2a3c7c088c39116f8a922e4 100644
GIT binary patch
literal 1882
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
UcD;i((*OVf07*qoM6N<$f?4fv#Q*>R

literal 2016
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

diff --git a/static/tabbar_icon/d-2.png b/static/tabbar_icon/d-2.png
deleted file mode 100644
index 26090829f0d454641db50c984dd352b86f039c30..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4051
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
FV1oKafNlT)

diff --git a/static/tabbar_icon/d-a.png b/static/tabbar_icon/d-a.png
index 03e65998f7cd0f4776a5af0faf8a2b9b673bbd33..6ef1d4ea4faf28fa3229eefd54eab7350090af2b 100644
GIT binary patch
literal 4335
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

literal 1461
zcmV;m1xosfP)<h;3K|Lk000e1NJLTq002Ay002A)1^@s6I{evk00001b5ch_0Itp)
z=>Px)Z%IT!RA@u(nonpPRUF5^zqga@CjGMs7O}OOS<JzJ2M-=RD9pwjB1B3dhkEcJ
zwoRmn5rim2sHn8kLzP-;qJpB*f-PEFX{5G0hk6i{UV3P0A+xo$l`3SDO)^P#-cKfN
zlHKg=%-dzNyKQ!_^L@Yf`@G-p_h#PPA7PFCXpQlr4*Z};{JxJc4@di$Xg>gpLe36)
zZSsm=(C%wsXSn4c5eAk3nQxOO4L|6jf%%0;9|AY7FKg=4T$;|^{I3|BJQ5vbEJQZ<
z=Ryng(5}><UiOrLx%06nW~CSaQ4fgpVjNS_GBU(G6gI7oRrGwYr3H=i5!M>cg78#6
zG}07ux@qU+Z!4eq0*@JbWV7G{V9^hPrs7P=8b)S<)2$DichY_~?xrz!(|jflOr@c<
zoMFOqp3sn8)Hm^a_OpV(6ULTJ4b*swh@LGOqPT(fEy=Ah)3OT<%dJ_yOwL>v<V>nC
zG+!2dsg6KkHlW$mmLL-OD_0zZs@fKk`x{N`8#UN_s(YIh?8%#+(2TU`8{ZHJJZrRl
zz(NeIm^?$kF_!#21D91vRCEzoH^@Y$DA+}@4>U3NQ(tP>7dUO`k7$H35Ji@Rj5OHU
z9x<=~ssd0>P2Q`=%eV(L0Ryyq{L{cqYu3;QS>$f_j&xpHXI?*DP7oDaO0XW0b{aPJ
zXuBtldCifxY1wf-0U{$Sx)&mevFBABET^U@*lg%&>Y%sA#|!zA2Rsvx-66uJ#Q{>v
zH=51lXXS(mvQ-i+;GTp$)7ZC$?amly3o?>lTyI*VK~9$I`D((tKIW(N3SgETZ!#^j
zTtI$yRvWgafGYu8Gr*OCtqI^t!d4x)(y&zpt_Ez?fO#(>*c|<liMor~{Z-zxLG~*C
zTACk;c4<Hqf2U4jOY|s%dV`$27n#713Pn4)vXvhm<$e$INXsF1PceiYs?g<#>>_2w
zBP>UvR{?4Vb4CSP71lk&&r#bp2JA>8`Lpu3^lC<!4{vPe261)yVB!z03hUal<85a_
zqU&z@^Vi|?)~jC76^$@|v2hQx$UTU7MVdJy882)7spBejX&YPHAsUt!62OE^Z}7Sw
zt0=G>j-G+n&YTPVts`+l71mvl8ACTnP$GMASaPh%w5*j2Rxw~cjP=|Qy#r+3q~v&b
zH@#_h>V!&Evo$pdoH??gM}$JB@?hNSBjQoX_$4IfMrqf~jRyjlN1{g<)V~13{09+@
zW*nT;{u#eOdkbISsleA{gn2l+&yjQ`B<DwI&(v)d5LHc00;@V-imndqR!y~c=~5!6
zI;I}sdW4sArD7i*s_9vZuAb8Ml&+`r@(QfxdAOANR2fsR;d%|%Yq)R?JCe7rGp(Og
zYN=WpuNuB3xyh>|$fE-w_7@0S7o8_5hr(v^qiVsZ%xfEZ9|V2Aq-CTdiLspSoh6=?
z2JOz+4*-@g#~IhcJl5gYWuxNMYHIAbei1}ZF9Wj~Nmy~OIrAbsZRk6MprhGhg8VRi
zKKb5iI$f%5+tA;HpigqfOCE@rR$d2>tH}diXg4Ifnw{3JkR|WG4ZQEyDOak~rHos+
zco%Jh%wlg&TO{-N3?tTRTAqz9o~?(|#^b$0gxu85`LWv%MRXjJFA1Pvi(n}Ls$(3m
zMnXKv%)R8%=qjY#*=Q!eDrB!<uch7Db^s7>t2$B(I)eNzd_MV#pD(`Mv@@OhJ_5Z{
z3oyYx$S=b(`Fhai8rUzLHuP?d=nx3)!IM@&!MG;bdAHfTuJpG|An?M5Wk8#P-lYj_
zW2R>aywtc>1w=6DUqO5+BXP1B*6E<A=Du;N;c*q`RElsF{VV&_YYzB-Z6&>GMAmt#
P00000NkvXXu0mjf4RyWk

diff --git a/static/tabbar_icon/d.png b/static/tabbar_icon/d.png
index 0ad3e8332aa2693520bf7519c4b8b3104a229416..6a414a115507bcd727aae82a56f0c2037180c71f 100644
GIT binary patch
literal 4070
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
Ye|6Hu*-G2-2LJ#707*qoM6N<$f+mHkG5`Po

literal 1371
zcmV-h1*H0kP)<h;3K|Lk000e1NJLTq002Ay002A)1^@s6I{evk00001b5ch_0Itp)
z=>Px)6-h)vRA@u(nn7qBRTzN(pV>eq?P{?H4<0nT2Lm2Fc<`W*Kn@WirO-fgFzn_%
zVnxIrgepW(RE&5~si4ApyJIw1h((JPBUQSGdJq&Z9#Yzk3sxvpp-VPoN%qYzPd4pj
zGBf*jGqba8_g&|I|NP(k-~Z2h|NIDd*}%Ju7y7_=y2o#O4>QJ|1Auu%tT>KytWYRi
z3Uk_R4a_-z9{^5l0}|0SA{q&UZX0-ddiwr>fr0%|ZvCyTt=huE!oTh4WQ?6e#Ch)=
z4ULEsLWtk|^cexq&dz3(QhFsP5b>dQ3^SB%5Ye2J@?8`8TrPJX0PM3Y>pUVp>NBTC
zMB`G*pS{mQfpfW>R{9<y9tVJwi7|VSX;iD#gG)<GwJ;scZ9Lv+G)C9g*K6r?`g=rt
z(hpiGHC8MZe{nwx1fH6jIy5*q_$>fDu?Gm_sYFy)N*%OqyB;*j6SFIuo10@B8ynRS
z=oKNva7*Bkk&#p;lerMEa>fv*f*KY8j!P*&GlczLY&%J<t*!kX09_M89B2v57<&^D
z=R7ZO0KjP?T2xA{n8KLIRVtOMrBX@j_Z{AB>=p`xCL+CvpN0bGa=8aA%lZ=$_qhaX
zj^i9D6be6@07NMh2D|+pKWHL4A*KAVWzzCX_e!Z}ipAo&C_zkgnZO1>Pe>_G`@LgV
z(qfG1*d1{xx+tZ5%EZ7ZW!iytLo20*ZQH&PWXmpK&iQo!IOJ0DqLlKZC}CRZ>IAl#
z#C*4LXbf}C$&(bGmQpUaGBT>?al&dF{XDz_7yw3v5T&Sq!t}%q+f%^ZfbALJZo&2h
za5rHS2ktg(qQFVOCI;NRc7BbB<LzYspyOgYI=cQ@nwgmy1Au#1S69zwv)L~J;HZhg
zQNSkRVaC`gT~N>kH&f`SV3PvAjEGqPXqZ5o!s<Kx(9qCfM663Gzia0#9otEZF_uNd
z%PwO=p-o}6KF;}h0MOy03j?;4GH-NS@}8xmJX&(jUjP8_MZ^zU7Xzk*5MP<Zx6eXC
zwOT#kS0C$Y(qfG1f}3Avz6qVlWIjj4Gp4Xj@9OL91^41K8jXi-+pc&QtZTrNlau??
z>GX9^C1r<=%|8ccOuXur;hgs#a6X@(uq;bgLA^tlWtWNQhkCufytue{^^O4MoPVq<
zlg*^^tA<oc{Zy$`E`}BGOyGOc!<_SX9LKrjIL@+d+t*A$Ol5i!*wpw=<odw+RFia;
z?!<GZbNU|cd-&E~>Ds}=bbEFp*Wc3pE#2SJw^ks|>tQGHX)>oD!~GcU$8c~A6VVYV
z<u@j=l$1<B4Bz9|5#)F9_zM6YbQwP<gm^nC7?bzveoI9B#3j3{duRKZAMld9I8H=Y
z%H{I#UN7k;hIcB%IsY919^0NzL?tQZsGmN+9*<*)sQ(Du97Ob%l=8Js4T^IfW9%hF
z{J>*xVC%y!VEx}Gl}hQ_v3pyC<2dt<<Gc~pDHkW0SGO*_XS3Op0PwoIEs}_CD5Z48
z(zmh2xAice&mXlcOK<HRL-#`gfUXt)0RVw5f^mW)Vv2|!(P0<R=*oo<GRTI&UQ5Q9
zZYq5_PUB<H{e=+X*)YAK-L$&!1^}<bU|8fTiAa>o<>y-^*OvX#jInV<JOu#y2UstT
zD@v(Xi^ZbRZ<&_Bny}ejJBEmdiRf{6<61&1@J}<3oGq8j=UREyZKDxzLQt{1whtW3
dvi6YD{{R$_r)vJ1pVt5Y002ovPDHLkV1lsllBECu

diff --git a/static/tabbar_icon/e-a.png b/static/tabbar_icon/e-a.png
index 81392a2a3924697007605214b74759ee2d08fca5..c6b7c1b8709d6fd5adf26493b1cf94150e503d85 100644
GIT binary patch
literal 3867
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

literal 2320
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

diff --git a/static/tabbar_icon/e.png b/static/tabbar_icon/e.png
index 2eb0788744dee1b8210eaa83210b1c11a20c2883..296fb09dc42bc37e55591e5c6ead94ac793063d1 100644
GIT binary patch
literal 2696
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
CWEMgI

literal 1969
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
D=K9^K


From e392079bc95c43bda93bdcccd9f74b8bf292dac6 Mon Sep 17 00:00:00 2001
From: THK3121 <thk121969318@163.com>
Date: Tue, 5 Sep 2023 16:34:37 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E7=A8=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/app.js                            |  4 +--
 pages/nongKe/food/index.vue              | 17 +++++------
 pages/nongKe/specialty/index.vue         | 17 +++++------
 pages/nongKe/supply_chain/supplier.vue   | 13 ++++++--
 pages/nongKe/supply_chain/supplierA.vue  | 25 +++++++++-------
 pages/nongKe/tourism/index.vue           | 17 +++++------
 pages/short_video/nvueSwiper/index.nvue  |  7 +++--
 pages/users/supply_procurement/index.vue | 38 ++++++++++++++----------
 8 files changed, 74 insertions(+), 64 deletions(-)

diff --git a/config/app.js b/config/app.js
index 29070a6..adddc06 100644
--- a/config/app.js
+++ b/config/app.js
@@ -9,8 +9,8 @@ let httpApiThree
 // 网络接口修改此字符 小程序域名要求https
 // let httpApi = 'http://192.168.31.110:8324' // 测试
 if (process.env.NODE_ENV === "development") {
-	httpApi = 'https://shop.lihaink.cn' // 生产
-	// httpApi = "https://crmeb-test.shop.lihaink.cn"
+	// httpApi = 'https://shop.lihaink.cn' // 生产
+	httpApi = "https://crmeb-test.shop.lihaink.cn"
 	// httpApi = "http://192.168.0.222"
 	// httpApi = "http://192.168.0.108:8325"
 	// httpApi = 'http://192.168.0.108:8325'
diff --git a/pages/nongKe/food/index.vue b/pages/nongKe/food/index.vue
index 20081fd..983cf82 100644
--- a/pages/nongKe/food/index.vue
+++ b/pages/nongKe/food/index.vue
@@ -23,9 +23,8 @@
 				:value='sotreParam.keyword' @confirm="searchSubmit"></input> -->
 						<u-search borderColor="#FF6D20" bgColor="white" :showAction="false" placeholder="搜索店铺名称"
 							v-model="sotreParam.keyword" class="serch_cls"></u-search>
-						<u--image @tap="searchSubmit" class="img_cls" style="position: absolute; top: 3px;right: 3px;"
-							:showLoading="true" src="/static/images/GXSC/SS.png" width="115.65rpx"
-							height="56.82rpx"></u--image>
+						<u--image @tap="searchSubmit" class="img_cls" :showLoading="true"
+							src="/static/images/GXSC/SS.png" width="115.65rpx" height="56.82rpx"></u--image>
 					</view>
 
 				</view>
@@ -1299,13 +1298,11 @@
 		}
 	}
 
-	.guanbi {
-		width: 20px;
-		height: 20px;
-		margin: 30px auto;
-	}
+	.img_cls {
+		position: absolute;
+		top: 50%;
+		right: 7rpx;
+		transform: translateY(-50%);
 
-	.pop {
-		z-index: 1;
 	}
 </style>
\ No newline at end of file
diff --git a/pages/nongKe/specialty/index.vue b/pages/nongKe/specialty/index.vue
index afb437f..0b553f2 100644
--- a/pages/nongKe/specialty/index.vue
+++ b/pages/nongKe/specialty/index.vue
@@ -26,9 +26,8 @@
 				:value='sotreParam.keyword' @confirm="searchSubmit"></input> -->
 						<u-search borderColor="#FF6D20" bgColor="white" :showAction="false" placeholder="搜索店铺名称"
 							v-model="sotreParam.keyword" class="serch_cls"></u-search>
-						<u--image @tap="searchSubmit" class="img_cls" style="position: absolute; top: 3px;right: 3px;"
-							:showLoading="true" src="/static/images/GXSC/SS.png" width="115.65rpx"
-							height="56.82rpx"></u--image>
+						<u--image @tap="searchSubmit" class="img_cls" :showLoading="true"
+							src="/static/images/GXSC/SS.png" width="115.65rpx" height="56.82rpx"></u--image>
 					</view>
 
 				</view>
@@ -1302,13 +1301,11 @@
 		}
 	}
 
-	.guanbi {
-		width: 20px;
-		height: 20px;
-		margin: 30px auto;
-	}
+	.img_cls {
+		position: absolute;
+		top: 50%;
+		right: 7rpx;
+		transform: translateY(-50%);
 
-	.pop {
-		z-index: 1;
 	}
 </style>
\ No newline at end of file
diff --git a/pages/nongKe/supply_chain/supplier.vue b/pages/nongKe/supply_chain/supplier.vue
index 2900889..6036de5 100644
--- a/pages/nongKe/supply_chain/supplier.vue
+++ b/pages/nongKe/supply_chain/supplier.vue
@@ -25,9 +25,8 @@
 				:value='sotreParam.keyword' @confirm="searchSubmit"></input> -->
 						<u-search borderColor="#FF6D20" bgColor="white" @change="test" :showAction="false"
 							placeholder="请输入..." v-model="sotreParam.keyword" class="serch_cls"></u-search>
-						<u--image @tap="searchSubmit" class="img_cls" style="position: absolute; top: 3px;right: 3px;"
-							:showLoading="true" src="/static/images/GXSC/SS.png" width="115.65rpx"
-							height="56.82rpx"></u--image>
+						<u--image @tap="searchSubmit" class="img_cls" :showLoading="true"
+							src="/static/images/GXSC/SS.png" width="115.65rpx" height="56.82rpx"></u--image>
 					</view>
 					<view class='iconfont search-right'
 						@click="goMap(`/pages/nongKe/supply_chain/maps?street_id=${street_id}`)">
@@ -1366,6 +1365,14 @@
 		margin: 30px auto;
 	}
 
+	.img_cls {
+		position: absolute;
+		top: 50%;
+		right: 7rpx;
+		transform: translateY(-50%);
+
+	}
+
 	.pop {
 		z-index: 1;
 	}
diff --git a/pages/nongKe/supply_chain/supplierA.vue b/pages/nongKe/supply_chain/supplierA.vue
index 77d7f69..4f9c78e 100644
--- a/pages/nongKe/supply_chain/supplierA.vue
+++ b/pages/nongKe/supply_chain/supplierA.vue
@@ -24,9 +24,8 @@
 				:value='sotreParam.keyword' @confirm="searchSubmit"></input> -->
 						<u-search borderColor="#FF6D20" bgColor="white" :showAction="false" placeholder="搜索店铺名称"
 							v-model="sotreParam.keyword" class="serch_cls"></u-search>
-						<u--image @tap="searchSubmit" class="img_cls" style="position: absolute; top: 3px;right: 3px;"
-							:showLoading="true" src="/static/images/GXSC/SS.png" width="115.65rpx"
-							height="56.82rpx"></u--image>
+						<u--image @tap="searchSubmit" class="img_cls" :showLoading="true"
+							src="/static/images/GXSC/SS.png" width="115.65rpx" height="56.82rpx"></u--image>
 					</view>
 
 				</view>
@@ -379,6 +378,7 @@
 			if (options.street_id != undefined) {
 				this.sotreParam.street_id = options.street_id
 			}
+
 			this.credit_buy = options.credit_buy
 			this.sotreParam.type_id = options.type_id
 			this.sotreParam.type_id = options.type_id && options.type_id.split(',').toString() || ''
@@ -396,7 +396,14 @@
 				let index = this.menuList.findIndex((item) => {
 					return item.merchant_category_id == options.merchant_category_id;
 				});
+				if (options.tit) {
+					this.titName = "先货后款"
+					return
+				}
 				this.titName = this.menuList[index].category_name
+
+
+
 				// console.log(this.menuList)
 			})
 			// console.log(this.menuList)
@@ -1320,13 +1327,11 @@
 		}
 	}
 
-	.guanbi {
-		width: 20px;
-		height: 20px;
-		margin: 30px auto;
-	}
+	.img_cls {
+		position: absolute;
+		top: 50%;
+		right: 7rpx;
+		transform: translateY(-50%);
 
-	.pop {
-		z-index: 1;
 	}
 </style>
\ No newline at end of file
diff --git a/pages/nongKe/tourism/index.vue b/pages/nongKe/tourism/index.vue
index ac5f2e8..8cf33a7 100644
--- a/pages/nongKe/tourism/index.vue
+++ b/pages/nongKe/tourism/index.vue
@@ -26,9 +26,8 @@
 				:value='sotreParam.keyword' @confirm="searchSubmit"></input> -->
 						<u-search borderColor="#FF6D20" bgColor="white" :showAction="false" placeholder="搜索店铺名称"
 							v-model="sotreParam.keyword" class="serch_cls"></u-search>
-						<u--image @tap="searchSubmit" class="img_cls" style="position: absolute; top: 3px;right: 3px;"
-							:showLoading="true" src="/static/images/GXSC/SS.png" width="115.65rpx"
-							height="56.82rpx"></u--image>
+						<u--image @tap="searchSubmit" class="img_cls" :showLoading="true"
+							src="/static/images/GXSC/SS.png" width="115.65rpx" height="56.82rpx"></u--image>
 					</view>
 
 				</view>
@@ -1302,13 +1301,11 @@
 		}
 	}
 
-	.guanbi {
-		width: 20px;
-		height: 20px;
-		margin: 30px auto;
-	}
+	.img_cls {
+		position: absolute;
+		top: 50%;
+		right: 7rpx;
+		transform: translateY(-50%);
 
-	.pop {
-		z-index: 1;
 	}
 </style>
\ No newline at end of file
diff --git a/pages/short_video/nvueSwiper/index.nvue b/pages/short_video/nvueSwiper/index.nvue
index 4dac07e..955dc8d 100644
--- a/pages/short_video/nvueSwiper/index.nvue
+++ b/pages/short_video/nvueSwiper/index.nvue
@@ -16,7 +16,7 @@
 
 
 
-		<view class="header" >
+		<view class="header">
 			<view class="tool-bar">
 				<view class='xiangzuo' @tap='goBack'>
 					<image src="@/static/images/icon-back.png" mode="aspectFit"></image>
@@ -1338,8 +1338,9 @@
 			.xiangzuo {
 				width: 23rpx;
 				height: 42rpx;
-            margin-right: 40rpx;
-            margin-left: 20rpx;
+				margin-right: 40rpx;
+				margin-left: 20rpx;
+
 				image {
 					width: 100%;
 					height: 100%;
diff --git a/pages/users/supply_procurement/index.vue b/pages/users/supply_procurement/index.vue
index b968269..f822612 100644
--- a/pages/users/supply_procurement/index.vue
+++ b/pages/users/supply_procurement/index.vue
@@ -1,6 +1,7 @@
 <template>
 	<view class="conent">
-		<view class="con_kuo" @click="navigator(`/pages/nongKe/supply_chain/supplier?type_id=12&isDetail=1&product_type=98&cate_id=${id}`)">
+		<view class="con_kuo"
+			@click="navigator(`/pages/nongKe/supply_chain/supplierA?tit=1&type_id=12&isDetail=1&product_type=98&cate_id=${id}`)">
 			<image class="con_img" src="@/static/images/bg1.png" mode=""></image>
 			<image class="con_ico" src="@/static/images/bgic1.png" mode=""></image>
 			<view class="con_text">
@@ -8,9 +9,10 @@
 				<span>先付款后发货</span>
 			</view>
 		</view>
-		<view class="con_kuo"  @click="navigator(`/pages/nongKe/supply_chain/supplier?type_id=12&isDetail=1&product_type=98&cate_id=${id}&credit_buy=1`)">
+		<view class="con_kuo"
+			@click="navigator(`/pages/nongKe/supply_chain/supplier?type_id=12&isDetail=1&product_type=98&cate_id=${id}&credit_buy=1`)">
 			<image class="con_img" src="@/static/images/bg2.png" mode=""></image>
-			<image  class="con_ico" src="@/static/images/bgic2.png" mode=""></image>
+			<image class="con_ico" src="@/static/images/bgic2.png" mode=""></image>
 			<view class="con_text">
 				<h3>先货后款</h3>
 				<span>先发货后付款</span>
@@ -21,16 +23,16 @@
 
 <script>
 	export default {
-		data(){
-			return{
-				id:''
+		data() {
+			return {
+				id: ''
 			}
 		},
 		onLoad(option) {
-			
-			this.id=option.cate_id
+
+			this.id = option.cate_id
 		},
-		methods:{
+		methods: {
 			navigator(url, t) {
 				uni.navigateTo({
 					url: url
@@ -38,33 +40,37 @@
 			},
 		}
 	}
-
 </script>
 
 <style lang="scss" scoped>
-	*{
+	* {
 		padding: 0;
 		margin: 0;
 	}
-	.conent{
+
+	.conent {
 		width: 100%;
 		display: flex;
 		justify-content: space-around;
 		margin-top: 20px;
-		.con_kuo{
+
+		.con_kuo {
 			position: relative;
-			.con_img{
+
+			.con_img {
 				width: 192px;
 				height: 92px;
 			}
-			.con_ico{
+
+			.con_ico {
 				position: absolute;
 				left: 25px;
 				top: 32px;
 				width: 31px;
 				height: 32px;
 			}
-			.con_text{
+
+			.con_text {
 				position: absolute;
 				left: 66px;
 				top: 20px;