From 2fe7fbbbd9ab3c7595d48c80ff58f6acde3bcdd9 Mon Sep 17 00:00:00 2001
From: mixtan <424491071@qq.com>
Date: Wed, 9 Jul 2025 17:16:34 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=E6=96=B0=E5=A2=9E=E5=8F=91=E7=8E=B0?=
 =?UTF-8?q?=E5=92=8C=E6=88=91=E7=9A=84=E6=A0=8F=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WaterfallsFlowItem/WaterfallsFlowItem.vue | 61 +++++++++++++++++++
 pagesub/index/components/tabbar.vue           | 52 ++++++++++++----
 2 files changed, 101 insertions(+), 12 deletions(-)
 create mode 100644 components/WaterfallsFlowItem/WaterfallsFlowItem.vue

diff --git a/components/WaterfallsFlowItem/WaterfallsFlowItem.vue b/components/WaterfallsFlowItem/WaterfallsFlowItem.vue
new file mode 100644
index 0000000..4902c97
--- /dev/null
+++ b/components/WaterfallsFlowItem/WaterfallsFlowItem.vue
@@ -0,0 +1,61 @@
+<template>
+	<view class="wf-item-page">
+		<image :src="item.story_file[0]" class="item-img" />
+		<view class="item-desc">
+			{{item.story_title || ''}}
+		</view>
+		<view class="item-info">
+			<image :src="item.user_avatar" mode="aspectFill" class="info-avatar" />
+			<view class="info-nickname">{{item.user_nickname}}</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props:{
+			item:{
+				type:Object,
+				require:true
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.wf-item-page{
+		background: #fff;
+		overflow: hidden;
+		border-radius: 5px;
+		position: relative;
+	}
+	
+	.item-img{
+		width: 100%;
+	}
+	
+	.item-info{
+		display: flex;
+		align-items: center;
+		padding: 5px;
+	}
+	
+	.info-avatar{
+		width: 25px;
+		height: 25px;
+		border-radius: 50%;
+		margin-right: 5px;
+	}
+	
+	.info-nickname{
+		font-size: 12px;
+		color: #333;
+	}
+	
+	.item-desc{
+		display: flex;
+		align-items: center;
+		padding: 5px 5px 0px 5px;
+		font-size: 12px;
+	}
+</style>
diff --git a/pagesub/index/components/tabbar.vue b/pagesub/index/components/tabbar.vue
index de0fabf..1b37201 100644
--- a/pagesub/index/components/tabbar.vue
+++ b/pagesub/index/components/tabbar.vue
@@ -14,6 +14,7 @@
         <view class="desc">首页</view>
       </view>
     </view>
+
     <view
       :class="['item', { current: current == 2 }]"
       @click="
@@ -33,14 +34,25 @@
         <view class="desc">分类</view>
       </view>
     </view>
-    <!-- <view
+
+    <view
       :class="['item', { current: current == 3 }]"
-      @click="gopage(3,'/pagesub/index/feed')"
-      >发现</view
-    > -->
+      @click=" gopage(3,`/pages/index/image?category_id=${categoryId}&store_id=${storeId}`)"
+    >
+      <view class="box">
+        <image
+          v-if="current == 3"
+          class="icon"
+          src="https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/icon/icon_feed_cur.png"
+        />
+        <image v-else class="icon" src="https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/icon/icon_feed.png" />
+        <view class="desc">发现</view>
+      </view>
+    </view>
+
     <view
       :class="['item', { current: current == 4 }]"
-      @click="gopage(4, '/pages/index/cart')"
+      @click="gopage(4, `/pages/index/cart?category_id=${categoryId}&store_id=${storeId}`)"
     >
       <view class="box">
         <image
@@ -53,11 +65,21 @@
         <text class="icon_badge">{{ goodsNum }}</text>
       </view>
     </view>
-    <!-- <view
+    
+    <view
       :class="['item', { current: current == 5 }]"
-      @click="gopage(5,`/pagesub/index/goods?store_id=${storeId}`)"
-      >商品</view
-    > -->
+      @click="gopage(5,`/pages/index/member?category_id=${categoryId}&store_id=${storeId}`)"
+    >
+      <view class="box">
+        <image
+          v-if="current == 5"
+          class="icon"
+          src="https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/icon/icon_mine_cur.png"
+        />
+        <image v-else class="icon" src="https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/icon/icon_mine.png" />
+        <view class="desc">我的</view>
+      </view>
+    </view>
   </view>
 </template>
 
@@ -100,9 +122,15 @@ export default {
         console.log("当前页面，不执行跳转");
         return;
       }
-      this.$.navigateTo({
-        url,
-      });
+      if([3,5].includes(tabIndex)){
+ this.$.switchTab({
+          url,
+        });
+      } else {
+        this.$.navigateTo({
+          url,
+        });
+      }
     },
   },
 };