From d14dc3063f6133cedd842247569944ab9c9613ab Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Tue, 5 Sep 2023 19:25:28 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/WaterfallsFlow/WaterfallsFlowo.vue        |  2 +-
 components/WaterfallsFlow/WaterfallsFlows.vue        |  1 -
 .../WaterfallsFlowItem/WaterfallsFlowItems.vue       |  8 ++------
 pages/columnGoods/goods_list/index.vue               |  1 -
 pages/supply_chains/supply_chains.vue                | 12 +++++++-----
 5 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/components/WaterfallsFlow/WaterfallsFlowo.vue b/components/WaterfallsFlow/WaterfallsFlowo.vue
index 561592e..e8cc612 100644
--- a/components/WaterfallsFlow/WaterfallsFlowo.vue
+++ b/components/WaterfallsFlow/WaterfallsFlowo.vue
@@ -101,7 +101,7 @@ export default {
 					if(this.mark < this.allList.length){
 						this.waterFall()
 					}
-					
+					console.log(this.rightList,this.leftList)
 				}
 			},
 			immediate: true,
diff --git a/components/WaterfallsFlow/WaterfallsFlows.vue b/components/WaterfallsFlow/WaterfallsFlows.vue
index 17461f6..e954156 100644
--- a/components/WaterfallsFlow/WaterfallsFlows.vue
+++ b/components/WaterfallsFlow/WaterfallsFlows.vue
@@ -108,7 +108,6 @@ export default {
 			deep:true
         },
 		mounted(){
-			
 			this.getUserInfo()
 		},
 
diff --git a/components/WaterfallsFlowItem/WaterfallsFlowItems.vue b/components/WaterfallsFlowItem/WaterfallsFlowItems.vue
index 7e8b621..a30a5c5 100644
--- a/components/WaterfallsFlowItem/WaterfallsFlowItems.vue
+++ b/components/WaterfallsFlowItem/WaterfallsFlowItems.vue
@@ -1,16 +1,14 @@
 <template>
 	<view class="wf-item-page" @click="gogogo(item)">
 
-
-
 		<image :src="item.image[0]" mode="widthFix" class="item-img" />
 
 		<view class="goods_item_img" v-if="item.video_link.length>0">
-			<image src="@/static/images/sp.png" mode="aspectFill"></image>
+			<image src="@/static/images/sp.png" mode="aspectFit"></image>
 		</view>
 		<view class="title">{{item.title}}</view>
 		<view class="item-info">
-			<image :src="(item.author && item.author.avatar) || '/static/images/f.png'" mode="aspectFill"
+			<image :src="(item.author && item.author.avatar) || '/static/images/f.png'" mode="aspectFit"
 				class="info-avatar" />
 			<view class="info-nickname">{{ item.author.nickname }}</view>
 		</view>
@@ -41,7 +39,6 @@
 			this.getUserInfo()
 		},
 
-
 		methods: {
 			/**
 			 * 获取个人用户信息
@@ -62,7 +59,6 @@
 						url: `/pages/short_video/appSwiper/index?id=${item.community_id}&uid=${this.user_id}&user=1`
 						// #endif
 					})
-
 				} else {
 					uni.navigateTo({
 						url: `/pages/plantGrass/plant_detail/index?id=${item.community_id}`
diff --git a/pages/columnGoods/goods_list/index.vue b/pages/columnGoods/goods_list/index.vue
index def6ed8..ea0fbeb 100644
--- a/pages/columnGoods/goods_list/index.vue
+++ b/pages/columnGoods/goods_list/index.vue
@@ -77,7 +77,6 @@
 				<view v-else class='list'>
 					<WaterfallsFlow :wfList='productList' @itemTap="godDetail" :type="1" @goShop="goShop"/>
 				</view>
-				
 				<view class='noCommodity' v-if="productList.length==0 && where.page > 1">
 					<view class='pictrue' style="margin: 60rpx auto;">
 						<image src='/static/images/noCart.png'></image>
diff --git a/pages/supply_chains/supply_chains.vue b/pages/supply_chains/supply_chains.vue
index 1d123bc..fa83bd5 100644
--- a/pages/supply_chains/supply_chains.vue
+++ b/pages/supply_chains/supply_chains.vue
@@ -74,8 +74,7 @@
 			</view>
 
 			<view class="list-con">
-				<view class="list-con-left"
-					@tap="navgo('/pages/nongKe/specialty/index?type_code=TypeFamousSpecialties')">
+				<view class="list-con-left" @tap="navgo('/pages/nongKe/specialty/index')">
 					<!-- <view class="list-con-title">
 						<view class="con-titlea">
 							名优特产
@@ -87,8 +86,7 @@
 					<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="con-right" style="margin-bottom: 20rpx" @click="navaction(1)">
 						<!-- <view class="list-con-title">
 							<view class="con-titlea">
 								当地美食
@@ -99,7 +97,7 @@
 						</view> -->
 						<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="con-right" @click="navaction(2)">
 						<!-- <view class="list-con-title">
 							<view class="con-titlea">
 								特色文旅
@@ -255,6 +253,10 @@
 
 			this.list()
 		},
+		beforeDestroy () {
+		  // 销毁监听事件
+		  this.$bus.$off('value-updated')
+		},
 		mounted() {
 
 			// #ifdef  H5