From 97d3e1cd36eb547f8d817fae814163237b9821bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=A6=E6=98=9F=E6=98=9F?= <605893810@qq.com>
Date: Mon, 17 Aug 2026 09:27:07 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9Aapp=E6=94=B9=E9=80=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .hbuilderx/launch.json                        |    3 +-
 components/choiceness/choiceness.vue          |   10 +-
 components/shop/parity-product-item.vue       |   49 +-
 pages.json                                    |    6 +
 pages/login_package/login/login.vue           |   19 +-
 pages/mine_package/mine_order/mine_order.vue  |   21 +-
 .../mine_order_info/mine_order_info.vue       |    4 +-
 pages/rwa_package/insights/search-result.vue  |  529 +++++++++
 pages/rwa_package/insights/search.vue         |   76 +-
 pages/sort/sort copy 2.vue                    | 1012 +++++++++++++++++
 pages/sort/sort.vue                           |  465 ++++----
 11 files changed, 1923 insertions(+), 271 deletions(-)
 create mode 100644 pages/rwa_package/insights/search-result.vue
 create mode 100644 pages/sort/sort copy 2.vue

diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index 7c9ec1f..be52294 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -8,7 +8,8 @@
             "type" : "uni-app:app-android"
         },
         {
-            "playground" : "standard",
+            "customPlaygroundType" : "device",
+            "playground" : "custom",
             "type" : "uni-app:app-ios"
         },
         {
diff --git a/components/choiceness/choiceness.vue b/components/choiceness/choiceness.vue
index 9017ed7..fb54c65 100644
--- a/components/choiceness/choiceness.vue
+++ b/components/choiceness/choiceness.vue
@@ -1,6 +1,6 @@
 <template>
   <view class="choiceness_warp">
-    <view class="choiceness_title">
+    <view class="choiceness_title" v-if="isTitle">
       <up-image src="/static/common/jingxuan_left.png" width="24" height="8" bgColor="#f1f6ff00"></up-image>
       <view class="choiceness_title_msg">为您精选</view>
       <up-image src="/static/common/jingxuan_right.png" width="24" height="8" bgColor="#f1f6ff00"></up-image>
@@ -28,6 +28,12 @@ import { searchList } from "@/api/product.js";
 
 export default {
   name: "choiceness",
+  props: {
+    isTitle: {
+      type: Boolean,
+      default: true
+    },
+  },
   data() {
     return {
       productList: [],
@@ -73,7 +79,7 @@ export default {
 
 <style lang="scss" scoped>
 .choiceness_warp {
-  margin-top: 35rpx;
+  margin-top: 30rpx;
 }
 
 .choiceness_title {
diff --git a/components/shop/parity-product-item.vue b/components/shop/parity-product-item.vue
index a474fb4..00ae32b 100644
--- a/components/shop/parity-product-item.vue
+++ b/components/shop/parity-product-item.vue
@@ -2,7 +2,7 @@
   <view class="parity-product-item-wrap">
     <!-- 样式 1 (图2样式) -->
     <view class="parity-product-item type-1" @click.stop="onClick" v-if="type == 1 || type == '1'">
-      <image class="top-img-1" :src="obj.url" mode="aspectFill" lazy-load />
+      <image class="top-img-1" :src="obj.bargainMainGraph || obj.url" mode="aspectFill" lazy-load />
       <view class="shop-bottom-panel-1">
         <view class="title-box">
           <text class="tag-badge" :style="{ backgroundColor: effectiveTagColor }" v-if="tagName || obj.tagName">
@@ -11,6 +11,13 @@
           <text class="title-text">{{ obj.title }}</text>
         </view>
 
+        <!-- 标签 sellingPoint -->
+        <view class="selling-point-box" v-if="sellingPointList && sellingPointList.length">
+          <text class="selling-point-item" v-for="(item, index) in sellingPointList" :key="index">
+            {{ item }}
+          </text>
+        </view>
+
         <!-- 有优惠券/积分 -->
         <view class="price-action-row" v-if="obj.buyDeductionValue">
           <view class="price-left">
@@ -92,8 +99,8 @@ export default {
   },
   computed: {
     getOrigPrice() {
-      if (this.obj && this.obj.aa !== undefined && this.obj.aa !== null && this.obj.aa !== '') {
-        return this.obj.aa;
+      if (this.obj && this.obj.adPrice !== undefined && this.obj.adPrice !== null && this.obj.adPrice !== '') {
+        return this.obj.adPrice;
       }
       return this.obj ? (this.obj.originalPrice || this.obj.marketPrice || this.obj.linePrice || this.obj.oldPrice || '') : '';
     },
@@ -111,6 +118,18 @@ export default {
       if (tag.includes('低价') || tag.includes('好物')) return '#FF9800';
       if (tag.includes('品牌') || tag.includes('特卖')) return '#333333';
       return '#7A35F6';
+    },
+    sellingPointList() {
+      if (!this.obj) return [];
+      const sp = this.obj.sellingPoint || this.obj.selling_point || this.obj.sellingPoints;
+      if (!sp) return [];
+      if (Array.isArray(sp)) {
+        return sp.map(item => String(item).trim()).filter(Boolean);
+      }
+      if (typeof sp === 'string') {
+        return sp.split(/[,，]/).map(item => item.trim()).filter(Boolean);
+      }
+      return [];
     }
   },
   methods: {
@@ -150,7 +169,6 @@ export default {
   .title-box {
     font-size: 28rpx;
     color: #1a1a1a;
-    max-height: 80rpx;
     font-weight: bold;
     overflow: hidden;
     text-overflow: ellipsis;
@@ -173,6 +191,29 @@ export default {
     vertical-align: middle;
   }
 
+  .selling-point-box {
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    margin-top: 12rpx;
+  }
+
+  .selling-point-item {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 20rpx;
+    color: #34C79F;
+    background-color: #ECFAF7;
+    border: 1rpx solid #34C79F;
+    border-radius: 6rpx;
+    padding: 2rpx 10rpx;
+    margin-right: 10rpx;
+    margin-bottom: 6rpx;
+    white-space: nowrap;
+    box-sizing: border-box;
+  }
+
   .price-action-row {
     display: flex;
     justify-content: space-between;
diff --git a/pages.json b/pages.json
index 7f81d55..8031f4d 100644
--- a/pages.json
+++ b/pages.json
@@ -460,6 +460,12 @@
             "navigationStyle": "custom"
           }
         },
+        {
+          "path": "insights/search-result",
+          "style": {
+            "navigationStyle": "custom"
+          }
+        },
         {
           "path": "rwa_add/rwa_add",
           "style": {
diff --git a/pages/login_package/login/login.vue b/pages/login_package/login/login.vue
index e3f32b5..746b7c3 100644
--- a/pages/login_package/login/login.vue
+++ b/pages/login_package/login/login.vue
@@ -56,7 +56,7 @@
       <!-- #ifdef APP-PLUS -->
       <view class="other_login">其他登录方式</view>
       <view class="login_other_icon">
-        <view class="login_other_item" @click="wechatOneLogin">
+        <view class="login_other_item" @click="wechatOneLogin(2)">
           <up-image src="/pages/login_package/static/login/WXICON.png" width="44" height="44"
             bgColor="#f1f6ff00"></up-image>
           微信登录
@@ -67,22 +67,22 @@
             bgColor="#f1f6ff00"></up-image>
           支付宝登录
         </view>
-        <!-- <view v-if="isIOS" class="login_other_item" @click="appleOneLogin">
+        <view v-if="isIOS" class="login_other_item" @click="appleOneLogin">
           <up-icon name="apple-fill" size="44" color="#000000"></up-icon>
           Apple登录
-        </view> -->
+        </view>
       </view>
       <!-- #endif -->
 
       <!-- #ifdef MP-WEIXIN -->
       <view class="other_login">其他登录方式</view>
-      <!-- <view class="login_other_icon">
-        <view class="login_other_item" @click="wechatOneLogin">
+      <view class="login_other_icon">
+        <view class="login_other_item" @click="wechatOneLogin(1)">
           <up-image src="/pages/login_package/static/login/WXICON.png" width="44" height="44"
             bgColor="#f1f6ff00"></up-image>
-          微信登录
+          微信登录11
         </view>
-      </view> -->
+      </view>
       <view class="login_other_icon">
         <view class="login_other_item_you" @click="jumpHome">
           游客模式
@@ -342,7 +342,7 @@ export default {
     },
 
     // 微信登录
-    async wechatOneLogin() {
+    async wechatOneLogin(type) {
       const then = this;
       this.loading = true;
 
@@ -356,7 +356,7 @@ export default {
           success: (res) => {
             if (res.confirm) {
               this.isPolicy = true;
-              this.wechatOneLogin();
+              this.wechatOneLogin(type);
             } else {
               this.loading = false;
             }
@@ -381,6 +381,7 @@ export default {
             const params = {
               isValid: false,
               token: loginRes.code,
+              type
               // 可以根据需要添加其他参数
             };
             console.log("微信登录接口返回-1:", params);
diff --git a/pages/mine_package/mine_order/mine_order.vue b/pages/mine_package/mine_order/mine_order.vue
index 20b3ed2..971cbe2 100644
--- a/pages/mine_package/mine_order/mine_order.vue
+++ b/pages/mine_package/mine_order/mine_order.vue
@@ -99,7 +99,7 @@
               <view>共{{ item.buyNum }}件,合计￥{{ item.sumAmount }}</view>
             </view> -->
             <view class="collect_msg" v-if="item.buyDeductionValue">共{{ item.buyNum }}件,合计数字积分{{ item.buyDeductionValue
-            }}
+              }}
               +￥{{ item.sumAmount }}</view>
             <view class="collect_msg" v-if="!item.buyDeductionValue">运费:￥{{ item.postage }},商品总价:￥{{ item.sumAmount }}
             </view>
@@ -143,14 +143,19 @@
 
               <view :class="[
                 'operate_comm',
-                form.type === MINE_ORDER_TYPE.UNPAID
-                  ? 'operate_but_3'
-                  : 'operate_but_1',
-              ]" v-if="!item.isAfter && form.type !== MINE_ORDER_TYPE.AFTER_SALE && item.status !== 5"
+                'operate_but_3'
+              ]" v-if="!item.isAfter && form.type === MINE_ORDER_TYPE.UNPAID && item.status !== 5"
                 @click="onSaleAfter(item)">
-                {{
-                  form.type === MINE_ORDER_TYPE.UNPAID ? "取消支付" : "申请售后"
-                }}
+                取消支付
+              </view>
+
+              <view :class="[
+                'operate_comm',
+                'operate_but_1'
+              ]"
+                v-if="(!item.isAfter && form.type !== MINE_ORDER_TYPE.UNPAID && form.type !== MINE_ORDER_TYPE.AFTER_SALE && item.status !== 5) || item.isAfterOpen"
+                @click="onSaleAfter(item)">
+                申请售后
               </view>
 
               <view class="operate_comm operate_but_1" v-if="form.type === MINE_ORDER_TYPE.AFTER_SALE"
diff --git a/pages/mine_package/mine_order_info/mine_order_info.vue b/pages/mine_package/mine_order_info/mine_order_info.vue
index 0f49725..c7877ed 100644
--- a/pages/mine_package/mine_order_info/mine_order_info.vue
+++ b/pages/mine_package/mine_order_info/mine_order_info.vue
@@ -298,10 +298,10 @@ export default {
 		formatDate,
 		formatDate1,
 		jumpLeft() {
+			const type = this.orderInfo.status + 1;
 			uni.navigateTo({
 				url:
-					"/pages/mine_package/mine_order/mine_order?type=" +
-					this.orderInfo.status,
+					"/pages/mine_package/mine_order/mine_order?type=" + type
 			});
 		},
 		wayShowFun(type) {
diff --git a/pages/rwa_package/insights/search-result.vue b/pages/rwa_package/insights/search-result.vue
new file mode 100644
index 0000000..c127118
--- /dev/null
+++ b/pages/rwa_package/insights/search-result.vue
@@ -0,0 +1,529 @@
+<template>
+	<view class="page-container">
+		<!-- 顶部状态栏安全高度 -->
+		<TopSafe bgColor="#ffffff"></TopSafe>
+
+		<!-- 1. 自定义导航栏：左侧返回箭头，中间“商品列表”标题 -->
+		<view class="custom-navbar">
+			<view class="nav-back flex-c" @click="onBack">
+				<u-icon name="arrow-left" size="36rpx" color="#333333"></u-icon>
+			</view>
+			<view class="nav-title">商品列表</view>
+			<view class="nav-right"></view>
+		</view>
+
+		<!-- 2. 搜索框区域 -->
+		<view class="search-bar-box">
+			<view class="search-inner">
+				<u-icon name="search" size="36rpx" color="#999999" class="search-icon"></u-icon>
+				<input class="search-input" v-model="searchInput" placeholder="请输入商品关键字"
+					placeholder-style="color: #999999; font-size: 28rpx;" confirm-type="search"
+					@confirm="onSearchBtnClick" />
+				<view class="search-btn flex-c" @click="onSearchBtnClick">
+					<text class="search-btn-text">搜索</text>
+				</view>
+			</view>
+		</view>
+
+		<!-- 3. 排序/筛选栏（右对齐：综合 / 价格） -->
+		<view class="filter-bar">
+			<view class="filter-item" :class="{ active: sortBy === 'relevance' }" @click="switchSort('relevance')">
+				<text class="filter-text">综合</text>
+				<view class="sort-icon-box">
+					<u-icon name="arrow-up-fill" size="12rpx"
+						:color="sortBy === 'relevance' && sortOrder === 'asc' ? '#7934f6' : '#cccccc'"
+						class="icon-up"></u-icon>
+					<u-icon name="arrow-down-fill" size="12rpx"
+						:color="sortBy === 'relevance' && sortOrder === 'desc' ? '#7934f6' : '#cccccc'"
+						class="icon-down"></u-icon>
+				</view>
+			</view>
+
+			<view class="filter-item" :class="{ active: sortBy === 'price' }" @click="switchSort('price')">
+				<text class="filter-text">价格</text>
+				<view class="sort-icon-box">
+					<u-icon name="arrow-up-fill" size="12rpx"
+						:color="sortBy === 'price' && sortOrder === 'asc' ? '#7934f6' : '#cccccc'"
+						class="icon-up"></u-icon>
+					<u-icon name="arrow-down-fill" size="12rpx"
+						:color="sortBy === 'price' && sortOrder === 'desc' ? '#7934f6' : '#cccccc'"
+						class="icon-down"></u-icon>
+				</view>
+			</view>
+		</view>
+
+		<!-- 4. 商品双列网格列表区域 -->
+		<scroll-view scroll-y class="product-scroll-view" @scrolltolower="loadMore" refresher-enabled
+			:refresher-triggered="isRefreshing" @refresherrefresh="onRefresh">
+			<view class="product-grid" v-if="dataList && dataList.length > 0">
+				<view class="product-card" v-for="(item, index) in dataList" :key="item.id || index"
+					@click="onJumpDetail(item)">
+					<!-- 商品大图 + 可选标签 -->
+					<view class="img-wrapper">
+						<image class="product-img"
+							:src="item.url || item.image || item.pic || '/static/common/default-goods.png'"
+							mode="aspectFill"></image>
+						<!-- <view class="image-tag" v-if="item.tagName || item.tag">
+							{{ item.tagName || item.tag }}
+						</view> -->
+					</view>
+
+					<!-- 商品信息 -->
+					<view class="card-info">
+						<view class="product-title">
+							{{ item.title || item.name || item.goodsName }}
+						</view>
+						<view class="price-sales-row">
+							<view class="price-box">
+								<text class="currency">¥</text>
+								<text class="price-val">{{ formatPrice(item.price || item.adPrice) }}</text>
+							</view>
+							<text class="sales-val"
+								v-if="item.sales !== undefined && item.sales !== null && item.sales !== ''">
+								全网销量{{ formatSales(item.sales) }}件
+							</text>
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<!-- 加载状态 / 无数据提示 -->
+			<view class="empty-box" v-else-if="!loading">
+				<u-icon name="empty-data" size="140rpx" color="#cccccc"></u-icon>
+				<text class="empty-text">暂无相关商品</text>
+			</view>
+
+			<view class="loading-more-box" v-if="loading && dataList.length > 0">
+				<text class="loading-text">加载中...</text>
+			</view>
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+import TopSafe from '@/components/common/top-safe.nvue';
+import { searchList } from '@/api/product.js';
+
+export default {
+	components: {
+		TopSafe
+	},
+	data() {
+		return {
+			searchInput: '',
+			dataList: [],
+			loading: false,
+			isRefreshing: false,
+			sortBy: 'relevance', // 'relevance' | 'price'
+			sortOrder: 'asc',    // 'asc' | 'desc'
+			page: 1,
+			pageSize: 20,
+			hasMore: true
+		};
+	},
+	onLoad(options) {
+		if (options && options.keyword) {
+			this.searchInput = decodeURIComponent(options.keyword);
+		}
+		this.fetchData();
+	},
+	methods: {
+		onBack() {
+			uni.navigateBack();
+		},
+		onSearchBtnClick() {
+			if (!this.searchInput || !this.searchInput.trim()) return;
+			this.saveSearchHistory(this.searchInput.trim());
+			this.page = 1;
+			this.hasMore = true;
+			this.fetchData();
+		},
+		saveSearchHistory(val) {
+			let historyStr = uni.getStorageSync('history') || '';
+			let historyList = historyStr ? historyStr.split(',').filter(item => item.trim() !== '') : [];
+			let idx = historyList.indexOf(val);
+			if (idx > -1) {
+				historyList.splice(idx, 1);
+			}
+			historyList.unshift(val);
+			if (historyList.length > 15) {
+				historyList.pop();
+			}
+			uni.setStorageSync('history', historyList.join(','));
+		},
+		async fetchData(isLoadMore = false) {
+			if (this.loading) return;
+			this.loading = true;
+
+			let params = {
+				keyword: this.searchInput.trim(),
+				page: this.page,
+				pageSize: this.pageSize,
+				sortBy: this.sortBy,
+				sortOrder: this.sortOrder
+			};
+
+			try {
+				const res = await searchList(params);
+				let list = [];
+				if (res && res.data) {
+					list = res.data;
+				} else if (Array.isArray(res)) {
+					list = res;
+				}
+
+				if (isLoadMore) {
+					this.dataList = [...this.dataList, ...list];
+				} else {
+					this.dataList = list;
+				}
+
+				if (list.length < this.pageSize) {
+					this.hasMore = false;
+				}
+			} catch (err) {
+				console.error('searchList error:', err);
+			} finally {
+				this.loading = false;
+				this.isRefreshing = false;
+			}
+		},
+		switchSort(type) {
+			if (type === 'relevance') {
+				if (this.sortBy === 'relevance') {
+					this.sortOrder = this.sortOrder === 'asc' ? 'desc' : 'asc';
+				} else {
+					this.sortBy = 'relevance';
+					this.sortOrder = 'asc';
+				}
+			} else if (type === 'price') {
+				if (this.sortBy === 'price') {
+					this.sortOrder = this.sortOrder === 'asc' ? 'desc' : 'asc';
+				} else {
+					this.sortBy = 'price';
+					this.sortOrder = 'asc';
+				}
+			}
+			this.page = 1;
+			this.hasMore = true;
+			this.fetchData();
+		},
+		onRefresh() {
+			this.isRefreshing = true;
+			this.page = 1;
+			this.hasMore = true;
+			this.fetchData();
+		},
+		loadMore() {
+			if (!this.hasMore || this.loading) return;
+			this.page++;
+			this.fetchData(true);
+		},
+		onJumpDetail(item) {
+			if (item && item.id) {
+				uni.navigateTo({
+					url: '/pages/other_package/productInfo/productInfo?id=' + item.id
+				});
+			}
+		},
+		formatPrice(val) {
+			if (val === undefined || val === null || val === '') return '0.00';
+			let num = parseFloat(val);
+			if (isNaN(num)) return val;
+			return num.toFixed(2);
+		},
+		formatSales(n) {
+			if (n === undefined || n === null || n === '') return '0';
+			let num = Number(n);
+			if (isNaN(num)) return n;
+			if (num >= 10000) {
+				return (num / 10000).toFixed(1).replace(/\.0$/, '') + '万+';
+			}
+			return String(num);
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.page-container {
+	width: 100%;
+	height: 100vh;
+	background-color: #f5f5f7;
+	display: flex;
+	flex-direction: column;
+	box-sizing: border-box;
+}
+
+/* 导航栏 */
+.custom-navbar {
+	width: 100%;
+	height: 88rpx;
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+	justify-content: space-between;
+	padding: 0 32rpx;
+	box-sizing: border-box;
+	background-color: #ffffff;
+	position: relative;
+	flex-shrink: 0;
+
+	.nav-back {
+		width: 60rpx;
+		height: 60rpx;
+		display: flex;
+		align-items: center;
+		justify-content: flex-start;
+	}
+
+	.nav-title {
+		font-size: 34rpx;
+		font-weight: bold;
+		color: #1a1a1a;
+		position: absolute;
+		left: 50%;
+		transform: translateX(-50%);
+		white-space: nowrap;
+	}
+
+	.nav-right {
+		width: 60rpx;
+	}
+}
+
+/* 搜索框区域 */
+.search-bar-box {
+	width: 100%;
+	padding: 16rpx 32rpx;
+	box-sizing: border-box;
+	background-color: #ffffff;
+	flex-shrink: 0;
+
+	.search-inner {
+		width: 100%;
+		height: 80rpx;
+		background-color: #ffffff;
+		border-radius: 40rpx;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		padding: 0 8rpx 0 28rpx;
+		box-sizing: border-box;
+		border: 2rpx solid #efefef;
+
+		.search-icon {
+			margin-right: 12rpx;
+		}
+
+		.search-input {
+			flex: 1;
+			height: 100%;
+			font-size: 28rpx;
+			color: #333333;
+			background: transparent;
+			border: none;
+		}
+
+		.search-btn {
+			height: 64rpx;
+			padding: 0 32rpx;
+			background: linear-gradient(270deg, #b164fb 0%, #7934f6 100%);
+			border-radius: 32rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+
+			.search-btn-text {
+				font-size: 28rpx;
+				color: #ffffff;
+				font-weight: 500;
+			}
+		}
+	}
+}
+
+/* 排序筛选栏 */
+.filter-bar {
+	width: 100%;
+	padding: 20rpx 40rpx 16rpx;
+	box-sizing: border-box;
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+	justify-content: flex-end;
+	gap: 48rpx;
+	background-color: #f5f5f7;
+	flex-shrink: 0;
+
+	.filter-item {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		cursor: pointer;
+
+		.filter-text {
+			font-size: 28rpx;
+			color: #666666;
+			font-weight: 400;
+			margin-right: 8rpx;
+		}
+
+		&.active {
+			.filter-text {
+				color: #7934f6;
+				font-weight: bold;
+			}
+		}
+
+		.sort-icon-box {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: center;
+			line-height: 1;
+
+			.icon-up {
+				margin-bottom: 2rpx;
+			}
+		}
+	}
+}
+
+/* 商品列表 Grid */
+.product-scroll-view {
+	flex: 1;
+	height: 0;
+	width: 100%;
+	box-sizing: border-box;
+}
+
+.product-grid {
+	width: 100%;
+	padding: 0 24rpx 30rpx;
+	box-sizing: border-box;
+	display: flex;
+	flex-direction: row;
+	flex-wrap: wrap;
+	justify-content: space-between;
+
+	.product-card {
+		width: 342rpx;
+		margin-bottom: 20rpx;
+		background-color: #ffffff;
+		border-radius: 20rpx;
+		overflow: hidden;
+		display: flex;
+		flex-direction: column;
+		box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.02);
+
+		.img-wrapper {
+			width: 100%;
+			height: 342rpx;
+			position: relative;
+			background-color: #f8f8f8;
+
+			.product-img {
+				width: 100%;
+				height: 100%;
+				border-radius: 20rpx 20rpx 0 0;
+			}
+
+			.image-tag {
+				position: absolute;
+				top: 12rpx;
+				right: 12rpx;
+				background: rgba(255, 192, 110, 0.9);
+				color: #8c4a00;
+				font-size: 20rpx;
+				padding: 4rpx 12rpx;
+				border-radius: 8rpx;
+				max-width: 80%;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+				overflow: hidden;
+			}
+		}
+
+		.card-info {
+			padding: 16rpx 20rpx 20rpx;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-between;
+			flex: 1;
+
+			.product-title {
+				font-size: 28rpx;
+				color: #333333;
+				font-weight: bold;
+				line-height: 38rpx;
+				height: 76rpx;
+				display: -webkit-box;
+				-webkit-line-clamp: 2;
+				-webkit-box-orient: vertical;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				word-break: break-all;
+				margin-bottom: 16rpx;
+			}
+
+			.price-sales-row {
+				display: flex;
+				flex-direction: row;
+				align-items: baseline;
+				justify-content: space-between;
+				width: 100%;
+
+				.price-box {
+					display: flex;
+					align-items: baseline;
+					color: #7934f6;
+
+					.currency {
+						font-size: 24rpx;
+						font-weight: bold;
+						margin-right: 2rpx;
+					}
+
+					.price-val {
+						font-size: 32rpx;
+						font-weight: bold;
+					}
+				}
+
+				.sales-val {
+					font-size: 22rpx;
+					color: #999999;
+					font-weight: normal;
+				}
+			}
+		}
+	}
+}
+
+.empty-box {
+	width: 100%;
+	padding: 120rpx 0;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+
+	.empty-text {
+		font-size: 28rpx;
+		color: #999999;
+		margin-top: 20rpx;
+	}
+}
+
+.loading-more-box {
+	width: 100%;
+	padding: 20rpx 0 40rpx;
+	text-align: center;
+
+	.loading-text {
+		font-size: 24rpx;
+		color: #999999;
+	}
+}
+</style>
diff --git a/pages/rwa_package/insights/search.vue b/pages/rwa_package/insights/search.vue
index 8b329be..750edd8 100644
--- a/pages/rwa_package/insights/search.vue
+++ b/pages/rwa_package/insights/search.vue
@@ -16,14 +16,8 @@
 		<view class="search-bar-box">
 			<view class="search-inner">
 				<u-icon name="search" size="36rpx" color="#999999" class="search-icon"></u-icon>
-				<input
-					class="search-input"
-					v-model="searchInput"
-					placeholder="请输入商品关键字"
-					placeholder-style="color: #999999; font-size: 28rpx;"
-					confirm-type="search"
-					@confirm="onSearch"
-				/>
+				<input class="search-input" v-model="searchInput" placeholder="请输入商品关键字"
+					placeholder-style="color: #999999; font-size: 28rpx;" confirm-type="search" @confirm="onSearch" />
 				<view class="search-btn flex-c" @click="onSearch">
 					<text class="search-btn-text">搜索</text>
 				</view>
@@ -34,26 +28,16 @@
 		<view class="history-container">
 			<view class="history-header flex-r-lr">
 				<text class="section-title">历史搜索</text>
-				<u-icon name="trash" size="38rpx" color="#999999" @click="toggleDel"></u-icon>
+				<u-icon name="trash" size="42rpx" color="#999999" @click="toggleDel"></u-icon>
 			</view>
 
 			<!-- 历史记录标签列表 -->
 			<view class="history-tags flex-r" v-if="historyList.length">
-				<view
-					class="history-tag-item flex-r"
-					v-for="(item, index) in historyList"
-					:key="index"
-					@click="onText(item)"
-				>
+				<view class="history-tag-item flex-r" v-for="(item, index) in historyList" :key="index"
+					@click="onText(item)">
 					<text class="tag-text">{{ item }}</text>
-					<u-icon
-						name="close-circle-fill"
-						size="28rpx"
-						color="#999999"
-						class="del-icon"
-						v-if="isDel"
-						@click.stop="onDel(index)"
-					></u-icon>
+					<u-icon name="close-circle-fill" size="28rpx" color="#999999" class="del-icon" v-if="isDel"
+						@click.stop="onDel(index)"></u-icon>
 				</view>
 			</view>
 
@@ -68,19 +52,18 @@
 			<view class="recommend-header">
 				<text class="section-title">猜你喜欢</text>
 			</view>
-			<!-- 猜你喜欢下面的列表按要求空着 -->
-			<view class="recommend-list">
-				<view class="product-grid" v-if="dataList && dataList.length">
-					<ShopItem
-						:obj="item"
-						class="product-item"
-						@click="onJump(item)"
-						v-for="item in dataList"
-						:key="item.id"
-					></ShopItem>
-				</view>
+			<view class="recommend-content">
+				<choiceness :isTitle="false" />
 			</view>
+			<!-- <view class="recommend-list">
+				<view class="product-grid" v-if="dataList && dataList.length">
+					<ShopItem :obj="item" class="product-item" @click="onJump(item)" v-for="item in dataList"
+						:key="item.id"></ShopItem>
+				</view>
+			</view> -->
 		</view>
+		<!-- 为您精选 -->
+
 
 		<DownPopup></DownPopup>
 	</view>
@@ -93,10 +76,10 @@ import TopSafe from '@/components/common/top-safe.nvue';
 import DownPopup from '@/components/common/down-popup.vue';
 import { searchList } from '@/api/product.js';
 import ShopItem from './components/shop-item.vue';
-import func from '@/utils/func.js';
+import choiceness from "@/components/choiceness/choiceness.vue";
 
 export default {
-	components: { Header, TopSafe, DownPopup, ShopItem },
+	components: { Header, TopSafe, DownPopup, ShopItem, choiceness },
 	data() {
 		return {
 			searchInput: '',
@@ -130,11 +113,8 @@ export default {
 				return;
 			}
 			this.onAdd();
-			let params = {
-				keyword: this.searchInput.trim()
-			};
-			searchList(params).then((res) => {
-				this.dataList = res.data || [];
+			uni.navigateTo({
+				url: '/pages/rwa_package/insights/search-result?keyword=' + encodeURIComponent(this.searchInput.trim())
 			});
 		},
 		onDel(index) {
@@ -305,9 +285,9 @@ export default {
 		width: 100%;
 
 		.history-tag-item {
-			padding: 10rpx 28rpx;
+			padding: 6rpx 24rpx;
 			background-color: #f5f5f7;
-			border-radius: 30rpx;
+			border-radius: 24rpx;
 			margin-right: 20rpx;
 			margin-bottom: 20rpx;
 			display: flex;
@@ -339,7 +319,7 @@ export default {
 /* 猜你喜欢 */
 .recommend-container {
 	width: 100%;
-	padding: 32rpx 32rpx;
+	padding: 20rpx 32rpx 0;
 	box-sizing: border-box;
 
 	.recommend-header {
@@ -350,11 +330,17 @@ export default {
 
 		.section-title {
 			font-size: 32rpx;
-			font-weight: bold;
 			color: #333333;
 		}
 	}
 
+	.recommend-content {
+		::v-deep(.choiceness_warp) {
+			margin-top: 15rpx;
+		}
+
+	}
+
 	.recommend-list {
 		width: 100%;
 		margin-top: 24rpx;
diff --git a/pages/sort/sort copy 2.vue b/pages/sort/sort copy 2.vue
new file mode 100644
index 0000000..9189f5d
--- /dev/null
+++ b/pages/sort/sort copy 2.vue	
@@ -0,0 +1,1012 @@
+<template>
+  <view class="sort_warp" :class="platformType ? '' : 'iosplatformType'">
+    <!-- #ifndef MP-WEIXIN -->
+    <TopSafe bgColor="#F2EBFF"></TopSafe>
+    <!-- #endif -->
+
+    <!-- 顶部固定区域：搜索 + 分类区域 -->
+    <view class="top_fixed_header" :class="{ is_expanded: showAllCategories }" :style="mpHeaderStyle">
+      <!-- 搜索框 -->
+      <view class="search_bar" @click="jumpSearch">
+        <u-icon name="search" size="18" color="#999"></u-icon>
+        <text class="search_placeholder">搜索</text>
+      </view>
+
+      <!-- 1. 未展开时：顶部分类横向滚动条 -->
+      <view class="top_category_row" v-if="!showAllCategories">
+        <scroll-view class="top_category_scroll" scroll-x :show-scrollbar="false">
+          <view class="top_cat_list">
+            <view class="top_cat_item" v-for="(item, index) in categoryList" :key="item.id || index"
+              @click="selectCategory(index)">
+              <view class="top_cat_img_box" :class="{ active_img: currentCategoryIndex === index }">
+                <image class="top_cat_img" :src="item.icon || defaultIcon" mode="aspectFill" />
+              </view>
+              <view class="top_cat_name_badge" :class="{ active_badge: currentCategoryIndex === index }">
+                {{ item.name }}
+              </view>
+            </view>
+          </view>
+        </scroll-view>
+
+        <!-- 右侧全部按钮 -->
+        <view class="expand_all_btn" @click="toggleAllCategories">
+          <text class="expand_text">全部</text>
+          <u-icon name="arrow-down-fill" size="10" color="#666"></u-icon>
+        </view>
+      </view>
+
+      <!-- 2. 点开全部时：展开所有分类网格面板 -->
+      <view class="all_categories_panel" v-else>
+        <view class="panel_header">
+          <text class="panel_title">所有分类</text>
+        </view>
+        <scroll-view class="panel_grid_scroll" scroll-y :show-scrollbar="false">
+          <view class="panel_grid">
+            <view class="top_cat_item panel_cat_item" v-for="(item, index) in categoryList" :key="item.id || index"
+              @click="selectCategory(index, true)">
+              <view class="top_cat_img_box" :class="{ active_img: currentCategoryIndex === index }">
+                <image class="top_cat_img" :src="item.icon || defaultIcon" mode="aspectFill" />
+              </view>
+              <view class="top_cat_name_badge" :class="{ active_badge: currentCategoryIndex === index }">
+                {{ item.name }}
+              </view>
+            </view>
+          </view>
+        </scroll-view>
+        <view class="collapse_btn" @click="toggleAllCategories">
+          <text style="margin-right: 6rpx;">全部收起</text>
+          <u-icon name="arrow-up" size="12" color="#666"></u-icon>
+        </view>
+      </view>
+    </view>
+
+    <!-- 主体区域：左侧边栏 + 右侧商品列表 -->
+    <view class="main_container">
+      <!-- 展开所有分类时的半透明遮罩 -->
+      <view class="mask_overlay" v-if="showAllCategories" @click="showAllCategories = false"></view>
+
+      <!-- 左侧分类侧边栏 -->
+      <scroll-view class="left_sidebar_scroll" scroll-y>
+        <view class="sidebar_item" v-for="(item, index) in categoryList" :key="item.id || index"
+          :class="{ active: currentCategoryIndex === index }" @click="selectCategory(index)">
+          <text class="sidebar_name">{{ item.name }}</text>
+        </view>
+      </scroll-view>
+
+      <!-- 右侧商品列表区 -->
+      <view class="right_content_area">
+        <!-- 排序栏 -->
+        <view class="sort_option_bar">
+          <view class="cat_title_text">{{ currentCategory ? currentCategory.name : '' }}</view>
+          <view class="sort_actions">
+            <view class="sort_item" :class="{ active: sortBy === 'relevance' }" @click="setSort('relevance')">
+              <text>综合</text>
+              <view class="sort_icon_box">
+                <u-icon name="arrow-up-fill" size="10rpx"
+                  :color="sortBy === 'relevance' && sortOrder === 'asc' ? '#7a35f6' : '#cccccc'"
+                  class="icon_up"></u-icon>
+                <u-icon name="arrow-down-fill" size="10rpx"
+                  :color="sortBy === 'relevance' && sortOrder === 'desc' ? '#7a35f6' : '#cccccc'"
+                  class="icon_down"></u-icon>
+              </view>
+            </view>
+            <view class="sort_item" :class="{ active: sortBy === 'sales' }" @click="setSort('sales')">
+              <text>销量</text>
+              <view class="sort_icon_box">
+                <u-icon name="arrow-up-fill" size="10rpx"
+                  :color="sortBy === 'sales' && sortOrder === 'asc' ? '#7a35f6' : '#cccccc'"
+                  class="icon_up"></u-icon>
+                <u-icon name="arrow-down-fill" size="10rpx"
+                  :color="sortBy === 'sales' && sortOrder === 'desc' ? '#7a35f6' : '#cccccc'"
+                  class="icon_down"></u-icon>
+              </view>
+            </view>
+            <view class="sort_item" :class="{ active: sortBy === 'price' }" @click="setSort('price')">
+              <text>价格</text>
+              <view class="sort_icon_box">
+                <u-icon name="arrow-up-fill" size="10rpx"
+                  :color="sortBy === 'price' && sortOrder === 'asc' ? '#7a35f6' : '#cccccc'"
+                  class="icon_up"></u-icon>
+                <u-icon name="arrow-down-fill" size="10rpx"
+                  :color="sortBy === 'price' && sortOrder === 'desc' ? '#7a35f6' : '#cccccc'"
+                  class="icon_down"></u-icon>
+              </view>
+            </view>
+          </view>
+        </view>
+
+        <!-- 商品列表 -->
+        <scroll-view class="product_list_scroll" scroll-y>
+          <view class="product_list_box" v-if="displayProducts && displayProducts.length > 0">
+            <view class="product_row_card" v-for="(item, index) in displayProducts" :key="item.id || index"
+              @click="jumpInfo(item)">
+              <view class="product_img_box">
+                <image class="product_img" :src="item.image || item.icon || defaultProductImg" mode="aspectFill"
+                  lazy-load />
+              </view>
+              <view class="product_info_box">
+                <view class="product_title">{{ item.name || item.title }}</view>
+
+                <view class="product_tags_row">
+                  <text class="tag_item tag_blue" v-if="item.tags && item.tags[0]">{{ item.tags[0] }}</text>
+                  <text class="tag_item tag_green" v-if="item.tags && item.tags[1]">{{ item.tags[1] }}</text>
+                  <text class="tag_item tag_blue" v-if="!item.tags">专业检测</text>
+                  <text class="tag_item tag_green" v-if="!item.tags">生态有机</text>
+                </view>
+
+                <view class="product_price_row">
+                  <view class="price_box">
+                    <text class="price_symbol">￥</text>
+                    <text class="price_val">{{ item.price }}</text>
+                  </view>
+                  <text class="sales_val">全网销量{{ limit999(item.sales) }}</text>
+                </view>
+              </view>
+            </view>
+          </view>
+          <view class="empty_box" v-else>
+            <image src="https://static.tbmall.xin/static/not_shopping.png" class="empty_img" />
+            <text class="empty_text">暂无商品数据</text>
+          </view>
+        </scroll-view>
+      </view>
+    </view>
+
+    <!-- #ifndef H5 || MP-WEIXIN-->
+    <CustomTabBar :tabIndex="1" />
+    <!-- #endif -->
+  </view>
+</template>
+
+<script>
+import { getCascadeCategory } from "@/api/common.js";
+import CustomTabBar from "@/components/custom-tab-bar.vue";
+import TopSafe from "@/components/common/top-safe.nvue";
+
+// 假数据列表：当后端接口未就绪时自动提供高保真模拟数据
+const MOCK_CATEGORIES = [
+  {
+    id: 101,
+    name: '有机食品',
+    icon: 'https://static.tbmall.xin/static/new-home/xinren.png',
+    foods: [
+      {
+        id: 1001,
+        name: '鲜8有机贝贝南瓜2500g粉糯板栗味自然生长不催熟',
+        title: '鲜8有机贝贝南瓜2500g粉糯板栗味自然生长不催熟',
+        price: '39.00',
+        sales: 888,
+        tags: ['专业检测', '生态有机'],
+        image: 'https://static.tbmall.xin/static/new-home/nangua.png'
+      },
+      {
+        id: 1002,
+        name: '采缇国产车厘子5kg4j大连美早樱桃生鲜次日达樱桃',
+        title: '采缇国产车厘子5kg4j大连美早樱桃生鲜次日达樱桃',
+        price: '26.99',
+        sales: 888,
+        tags: ['专业检测', '生态有机'],
+        image: 'https://static.tbmall.xin/static/new-home/baokuan.png'
+      },
+      {
+        id: 1003,
+        name: '江苏白凤水蜜桃 应季水果 &新鲜礼盒装',
+        title: '江苏白凤水蜜桃 应季水果 &新鲜礼盒装',
+        price: '34.88',
+        sales: 888,
+        tags: ['专业检测', '生态有机'],
+        image: 'https://static.tbmall.xin/static/new-home/cart.png'
+      },
+      {
+        id: 1004,
+        name: '季新鲜 &进口山竹时令 &老树麻竹整箱送礼',
+        title: '季新鲜 &进口山竹时令 &老树麻竹整箱送礼',
+        price: '52.00',
+        sales: 888,
+        tags: ['专业检测', '生态有机'],
+        image: 'https://static.tbmall.xin/static/new-home/huiyuan.png'
+      }
+    ]
+  },
+  {
+    id: 102,
+    name: '生鲜食材',
+    icon: 'https://static.tbmall.xin/static/new-home/baokuan.png',
+    foods: [
+      {
+        id: 1005,
+        name: '精选新鲜三文鱼中段切片 200g刺身级',
+        title: '精选新鲜三文鱼中段切片 200g刺身级',
+        price: '59.90',
+        sales: 1200,
+        tags: ['冷链速达', '产地直供'],
+        image: 'https://static.tbmall.xin/static/new-home/baokuan.png'
+      },
+      {
+        id: 1006,
+        name: '澳洲进口谷饲安格斯原切雪花牛肉卷 500g',
+        title: '澳洲进口谷饲安格斯原切雪花牛肉卷 500g',
+        price: '89.00',
+        sales: 650,
+        tags: ['原切牛肉', '品质严选'],
+        image: 'https://static.tbmall.xin/static/new-home/cart.png'
+      }
+    ]
+  },
+  {
+    id: 103,
+    name: '米面粮油',
+    icon: 'https://static.tbmall.xin/static/new-home/cart.png',
+    foods: [
+      {
+        id: 1007,
+        name: '五常大米 优质长粒香米 5kg真空包装',
+        title: '五常大米 优质长粒香米 5kg真空包装',
+        price: '49.90',
+        sales: 3400,
+        tags: ['核心产区', '自然醇香'],
+        image: 'https://static.tbmall.xin/static/new-home/xinren.png'
+      }
+    ]
+  },
+  {
+    id: 104,
+    name: '零食饮料',
+    icon: 'https://static.tbmall.xin/static/new-home/huiyuan.png',
+    foods: [
+      {
+        id: 1008,
+        name: '花生造黑松露黑麦苏打饼干 590g*2盒',
+        title: '花生造黑松露黑麦苏打饼干 590g*2盒',
+        price: '29.90',
+        sales: 2300,
+        tags: ['零反式脂肪酸', '拒绝油炸'],
+        image: 'https://static.tbmall.xin/static/new-home/huiyuan.png'
+      }
+    ]
+  },
+  {
+    id: 105,
+    name: '滋补养生',
+    icon: 'https://static.tbmall.xin/static/new-home/xinren.png',
+    foods: [
+      {
+        id: 1009,
+        name: '青海野生黑枸杞干果 250g特级罐装',
+        title: '青海野生黑枸杞干果 250g特级罐装',
+        price: '78.00',
+        sales: 510,
+        tags: ['正宗原产', '花青素丰富'],
+        image: 'https://static.tbmall.xin/static/new-home/nangua.png'
+      }
+    ]
+  },
+  {
+    id: 106,
+    name: '非遗传承',
+    icon: 'https://static.tbmall.xin/static/new-home/baokuan.png',
+    foods: []
+  },
+  {
+    id: 107,
+    name: '家居百货',
+    icon: 'https://static.tbmall.xin/static/new-home/cart.png',
+    foods: []
+  },
+  {
+    id: 108,
+    name: '美妆护肤',
+    icon: 'https://static.tbmall.xin/static/new-home/huiyuan.png',
+    foods: []
+  },
+  {
+    id: 109,
+    name: '其他特色',
+    icon: 'https://static.tbmall.xin/static/new-home/xinren.png',
+    foods: []
+  }
+];
+
+export default {
+  components: { CustomTabBar, TopSafe },
+  data() {
+    return {
+      platformType: true,
+      currentCategoryIndex: 0,
+      showAllCategories: false,
+      sortBy: 'relevance', // 'relevance' | 'sales' | 'price'
+      sortOrder: 'asc',    // 'asc' | 'desc'
+      categoryList: [],    // 对应 sort copy.vue 的 tabbarList (顶层主分类)
+      capsuleTop: 0,
+      defaultIcon: 'https://static.tbmall.xin/static/new-home/xinren.png',
+      defaultProductImg: 'https://static.tbmall.xin/static/new-home/nangua.png',
+      isFromSortShop: false,
+      loading: false
+    };
+  },
+  computed: {
+    mpHeaderStyle() {
+      /*#ifdef MP-WEIXIN*/
+      if (this.capsuleTop) {
+        return { paddingTop: this.capsuleTop + 'px' };
+      }
+      return { paddingTop: '80rpx' };
+      /*#endif*/
+      return {};
+    },
+    currentCategory() {
+      return this.categoryList[this.currentCategoryIndex] || null;
+    },
+    displayProducts() {
+      if (!this.currentCategory) return [];
+      let list = [];
+      if (this.currentCategory.foods && this.currentCategory.foods.length > 0) {
+        list = [...this.currentCategory.foods];
+      } else if (this.currentCategory.productList && this.currentCategory.productList.length > 0) {
+        list = [...this.currentCategory.productList];
+      }
+      if (!list || list.length === 0) return [];
+
+      if (this.sortBy === 'sales') {
+        list.sort((a, b) => {
+          let salesA = Number(a.sales) || 0;
+          let salesB = Number(b.sales) || 0;
+          return this.sortOrder === 'asc' ? salesA - salesB : salesB - salesA;
+        });
+      } else if (this.sortBy === 'price') {
+        list.sort((a, b) => {
+          let priceA = Number(a.price || a.adPrice) || 0;
+          let priceB = Number(b.price || b.adPrice) || 0;
+          return this.sortOrder === 'asc' ? priceA - priceB : priceB - priceA;
+        });
+      } else if (this.sortBy === 'relevance') {
+        if (this.sortOrder === 'desc') {
+          list.reverse();
+        }
+      }
+      return list;
+    }
+  },
+  onShow() {
+    /*#ifdef APP-PLUS*/
+    uni.hideTabBar({ animation: false });
+    const appUpdate = uni.getStorageSync("platform");
+    this.platformType = appUpdate == "android" ? "ANDROID" : "IOS";
+    /*#endif*/
+
+    /*#ifdef MP-WEIXIN*/
+    try {
+      const menu = uni.getMenuButtonBoundingClientRect();
+      if (menu && menu.bottom) {
+        this.capsuleTop = menu.bottom + 6;
+      }
+    } catch (e) {}
+    /*#endif*/
+
+    const isBackFromSortShop = this.isFromSortShop;
+    this.isFromSortShop = false;
+
+    this.fetchCategories(isBackFromSortShop);
+  },
+  methods: {
+    // 异步查询分类接口
+    async getSortApi(pId) {
+      const params = {
+        parentId: pId,
+        sortBy: this.sortBy,
+        sortOrder: this.sortOrder
+      };
+      try {
+        const resp = await getCascadeCategory(params);
+        if (resp && resp.bizcode === 100 && resp.data) {
+          return resp.data;
+        }
+      } catch (e) {
+        console.error("getCascadeCategory error:", e);
+      }
+      return [];
+    },
+
+    // 1. 初始化/获取顶层主分类列表（对应 tabbarList）
+    async fetchCategories(isBack = false) {
+      try {
+        const topList = await this.getSortApi(0);
+        if (topList && topList.length > 0) {
+          this.categoryList = topList;
+        } else {
+          this.categoryList = MOCK_CATEGORIES;
+        }
+      } catch (e) {
+        console.log("使用模拟分类数据", e);
+        this.categoryList = MOCK_CATEGORIES;
+      }
+
+      let targetIndex = 0;
+      if (isBack) {
+        const sortId = uni.getStorageSync("sortId");
+        if (sortId) {
+          let idx = this.categoryList.findIndex(item => item.id === sortId);
+          if (idx !== -1) targetIndex = idx;
+          else if (this.currentCategoryIndex >= 0 && this.currentCategoryIndex < this.categoryList.length) {
+            targetIndex = this.currentCategoryIndex;
+          }
+        }
+      } else {
+        uni.removeStorageSync("sortId");
+        targetIndex = 0;
+      }
+
+      this.selectCategory(targetIndex);
+    },
+
+    // 2. 选中某个顶层分类并加载右侧货品数据（对应 tabbarContentList 结构）
+    async selectCategory(index, closePopup = false) {
+      this.currentCategoryIndex = index;
+      if (closePopup) {
+        this.showAllCategories = false;
+      }
+
+      const item = this.categoryList[index];
+      if (!item) return;
+
+      if (item.id) {
+        uni.setStorageSync("sortId", item.id);
+      }
+
+      // 如果为 mock 数据且已包含 foods 列表，直接渲染
+      if (!item.id || typeof item.id !== 'number' || (item.foods && item.foods.length > 0 && !item._fromApi)) {
+        return;
+      }
+
+      this.loading = true;
+      try {
+        // 参考 sort copy.vue: 依次查询二级分类 (firstData) 及三级货品 (twoData)
+        const firstData = await this.getSortApi(item.id);
+        let allProducts = [];
+
+        if (firstData && firstData.length > 0) {
+          for (let fItem of firstData) {
+            const twoData = await this.getSortApi(fItem.id);
+            fItem.foods = twoData || [];
+            if (fItem.foods && fItem.foods.length > 0) {
+              allProducts.push(...fItem.foods);
+            } else {
+              allProducts.push(fItem);
+            }
+          }
+          this.$set(this.categoryList[index], 'tabbarContentList', firstData);
+          this.$set(this.categoryList[index], 'foods', allProducts);
+          this.$set(this.categoryList[index], '_fromApi', true);
+        }
+      } catch (err) {
+        console.error("加载右侧货品数据失败:", err);
+      } finally {
+        this.loading = false;
+      }
+    },
+
+    toggleAllCategories() {
+      this.showAllCategories = !this.showAllCategories;
+    },
+
+    setSort(type) {
+      if (type === 'relevance') {
+        if (this.sortBy === 'relevance') {
+          this.sortOrder = this.sortOrder === 'asc' ? 'desc' : 'asc';
+        } else {
+          this.sortBy = 'relevance';
+          this.sortOrder = 'asc';
+        }
+      } else if (type === 'sales') {
+        if (this.sortBy === 'sales') {
+          this.sortOrder = this.sortOrder === 'asc' ? 'desc' : 'asc';
+        } else {
+          this.sortBy = 'sales';
+          this.sortOrder = 'asc';
+        }
+      } else if (type === 'price') {
+        if (this.sortBy === 'price') {
+          this.sortOrder = this.sortOrder === 'asc' ? 'desc' : 'asc';
+        } else {
+          this.sortBy = 'price';
+          this.sortOrder = 'asc';
+        }
+      }
+      if (this.currentCategory) {
+        this.$set(this.categoryList[this.currentCategoryIndex], '_fromApi', false);
+      }
+      this.selectCategory(this.currentCategoryIndex);
+    },
+
+    limit999(n) {
+      const num = Number(n);
+      if (isNaN(num) || num < 10000) {
+        return n != null && n !== '' ? String(n) : '0';
+      }
+      return `${Math.floor(num / 10000)}万+`;
+    },
+
+    jumpSearch() {
+      uni.navigateTo({
+        url: "/pages/rwa_package/insights/search",
+      });
+    },
+
+    jumpInfo(item) {
+      this.isFromSortShop = true;
+      uni.navigateTo({
+        url: `/pages/rwa_package/shop/sort-shop?id=${item.id}&name=${encodeURIComponent(item.name || item.title || '')}`,
+      });
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+page {
+  height: 100%;
+  overflow: hidden;
+}
+
+.sort_warp {
+  height: 100vh;
+  /* #ifdef H5 */
+  height: calc(100vh - var(--window-top, 0px) - var(--window-bottom, 0px));
+  /* #endif */
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+  box-sizing: border-box;
+  background-color: #ffffff;
+  position: relative;
+}
+
+/* 顶部固定区域 */
+.top_fixed_header {
+  position: relative;
+  z-index: 100;
+  background: linear-gradient(180deg, #F2EBFF 0%, #FFFFFF 100%);
+  border-bottom-left-radius: 36rpx;
+  border-bottom-right-radius: 36rpx;
+  overflow: hidden;
+  flex-shrink: 0;
+  box-shadow: none;
+  transition: all 0.2s;
+
+  &.is_expanded {
+    background: linear-gradient(180deg, #F2EBFF 0%, #FFFFFF 100%, #FFFFFF 100%) !important;
+    border-bottom-left-radius: 36rpx !important;
+    border-bottom-right-radius: 36rpx !important;
+    box-shadow: 0 12rpx 32rpx rgba(122, 53, 246, 0.12) !important;
+    overflow: hidden !important;
+  }
+}
+
+/* 搜索框 */
+.search_bar {
+  margin: 16rpx 24rpx 12rpx;
+  height: 72rpx;
+  background-color: #ffffff;
+  border-radius: 36rpx;
+  padding: 0 28rpx;
+  display: flex;
+  align-items: center;
+
+  .search_placeholder {
+    font-size: 28rpx;
+    color: #999999;
+    margin-left: 12rpx;
+  }
+}
+
+/* 顶部分类横划栏 */
+.top_category_row {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 10rpx 0 16rpx 20rpx;
+
+  .top_category_scroll {
+    flex: 1;
+    overflow-x: auto;
+    white-space: nowrap;
+    min-width: 0;
+  }
+
+  .top_cat_list {
+    display: inline-flex;
+    align-items: flex-start;
+  }
+
+  .expand_all_btn {
+    width: 90rpx;
+    flex-shrink: 0;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    font-size: 22rpx;
+    color: #666666;
+    padding: 0 12rpx;
+
+    .expand_text {
+      font-size: 22rpx;
+      color: #666666;
+      margin-bottom: 4rpx;
+    }
+  }
+}
+
+/* 分类 Icon 与 Badge 通用样式（同时作用于横滑栏与展开网格） */
+.top_cat_item {
+  display: inline-flex;
+  flex-direction: column;
+  align-items: center;
+  margin-right: 32rpx;
+  box-sizing: border-box;
+
+  &.panel_cat_item {
+    width: 20% !important;
+    max-width: 20% !important;
+    margin-right: 0 !important;
+    margin-bottom: 24rpx !important;
+  }
+
+  .top_cat_img_box {
+    width: 96rpx !important;
+    height: 96rpx !important;
+    min-width: 96rpx !important;
+    max-width: 96rpx !important;
+    min-height: 96rpx !important;
+    max-height: 96rpx !important;
+    border-radius: 50% !important;
+    overflow: hidden !important;
+    background: #f7f7f7;
+    display: flex !important;
+    align-items: center !important;
+    justify-content: center !important;
+    box-sizing: border-box !important;
+    border: 4rpx solid transparent;
+    transition: all 0.2s;
+    flex-shrink: 0 !important;
+
+    &.active_img {
+      border-color: #7a35f6 !important;
+    }
+  }
+
+  .top_cat_img {
+    width: 88rpx !important;
+    height: 88rpx !important;
+    min-width: 88rpx !important;
+    max-width: 88rpx !important;
+    min-height: 88rpx !important;
+    max-height: 88rpx !important;
+    border-radius: 50% !important;
+    display: block !important;
+    flex-shrink: 0 !important;
+  }
+
+  .top_cat_name_badge {
+    font-size: 22rpx !important;
+    color: #666666 !important;
+    margin-top: 10rpx !important;
+    padding: 2rpx 12rpx !important;
+    border-radius: 16rpx !important;
+    line-height: 32rpx !important;
+    white-space: nowrap !important;
+    transition: all 0.2s;
+
+    &.active_badge {
+      background-color: #7a35f6 !important;
+      color: #ffffff !important;
+      font-weight: bold !important;
+    }
+  }
+}
+
+/* 点开全部时的网格面板 */
+.all_categories_panel {
+  background: transparent;
+  padding: 16rpx 24rpx 0;
+  border-bottom-left-radius: 36rpx !important;
+  border-bottom-right-radius: 36rpx !important;
+  overflow: hidden !important;
+
+  .panel_header {
+    margin-bottom: 20rpx;
+    padding-left: 8rpx;
+
+    .panel_title {
+      font-size: 30rpx;
+      font-weight: bold;
+      color: #1a1a1a;
+    }
+  }
+
+  .panel_grid_scroll {
+    max-height: 55vh;
+    overflow-y: auto;
+  }
+
+  .panel_grid {
+    display: flex !important;
+    flex-wrap: wrap !important;
+    width: 100% !important;
+  }
+
+  .collapse_btn {
+    display: flex !important;
+    align-items: center !important;
+    justify-content: center !important;
+    font-size: 24rpx !important;
+    color: #666666 !important;
+    height: 80rpx !important;
+    background-color: #ffffff !important;
+    border-top: 1rpx solid #eeeeee !important;
+    margin-top: 16rpx !important;
+    margin-left: -24rpx !important;
+    margin-right: -24rpx !important;
+    border-bottom-left-radius: 36rpx !important;
+    border-bottom-right-radius: 36rpx !important;
+    overflow: hidden !important;
+  }
+}
+
+/* 主内容区 */
+.main_container {
+  position: relative;
+  flex: 1;
+  display: flex;
+  flex-direction: row;
+  min-height: 0;
+  width: 100%;
+  background-color: #f7f7f7;
+  overflow: hidden;
+
+  /* 展开所有分类时的半透明遮罩 */
+  .mask_overlay {
+    position: fixed !important;
+    top: 0 !important;
+    left: 0 !important;
+    right: 0 !important;
+    bottom: 0 !important;
+    width: 100vw !important;
+    height: 100vh !important;
+    background-color: rgba(0, 0, 0, 0.45) !important;
+    z-index: 90 !important;
+  }
+}
+
+/* 左侧边栏 */
+.left_sidebar_scroll {
+  width: 180rpx;
+  height: 100%;
+  flex-shrink: 0;
+  background-color: #f7f7f7;
+  overflow-y: auto;
+
+  /* #ifdef APP-PLUS */
+  padding-bottom: calc(110rpx + env(safe-area-inset-bottom));
+  /* #endif */
+
+  .sidebar_item {
+    height: 104rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 26rpx;
+    color: #555555;
+    padding: 0 12rpx;
+    text-align: center;
+    position: relative;
+    box-sizing: border-box;
+
+    &.active {
+      background-color: #ffffff;
+      color: #7a35f6;
+      font-weight: bold;
+      font-size: 28rpx;
+
+      &::before {
+        content: "";
+        position: absolute;
+        left: 0;
+        top: 34rpx;
+        width: 6rpx;
+        height: 36rpx;
+        background-color: #7a35f6;
+        border-radius: 0 4rpx 4rpx 0;
+      }
+    }
+  }
+}
+
+/* 右侧内容区域 */
+.right_content_area {
+  flex: 1;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  background-color: #ffffff;
+  min-width: 0;
+}
+
+/* 右侧排序栏 */
+.sort_option_bar {
+  height: 80rpx;
+  padding: 0 24rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-bottom: none;
+  flex-shrink: 0;
+
+  .cat_title_text {
+    font-size: 30rpx;
+    font-weight: bold;
+    color: #7a35f6;
+  }
+
+  .sort_actions {
+    display: flex;
+    align-items: center;
+    gap: 32rpx;
+
+    .sort_item {
+      font-size: 26rpx;
+      color: #999999;
+      display: flex;
+      align-items: center;
+      cursor: pointer;
+
+      &.active {
+        color: #7a35f6;
+        font-weight: bold;
+      }
+
+      .sort_icon_box {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
+        margin-left: 6rpx;
+        line-height: 1;
+
+        .icon_up {
+          margin-bottom: 2rpx;
+        }
+      }
+    }
+  }
+}
+
+/* 商品列表 */
+.product_list_scroll {
+  flex: 1;
+  height: 100%;
+  overflow-y: auto;
+
+  /* #ifdef APP-PLUS */
+  padding-bottom: calc(110rpx + env(safe-area-inset-bottom));
+  /* #endif */
+
+  .product_list_box {
+    padding: 0 24rpx;
+  }
+
+  .product_row_card {
+    display: flex;
+    flex-direction: row;
+    padding: 24rpx 0;
+    border-bottom: 1rpx solid #f7f7f7;
+    background: #ffffff;
+
+    .product_img_box {
+      width: 200rpx;
+      height: 200rpx;
+      border-radius: 16rpx;
+      overflow: hidden;
+      flex-shrink: 0;
+      margin-right: 20rpx;
+      background: #f9f9f9;
+
+      .product_img {
+        width: 100%;
+        height: 100%;
+      }
+    }
+
+    .product_info_box {
+      flex: 1;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
+      min-width: 0;
+
+      .product_title {
+        font-size: 28rpx;
+        font-weight: bold;
+        color: #1a1a1a;
+        line-height: 38rpx;
+        max-height: 76rpx;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        display: -webkit-box;
+        -webkit-line-clamp: 2;
+        -webkit-box-orient: vertical;
+        word-break: break-all;
+      }
+
+      .product_tags_row {
+        display: flex;
+        gap: 12rpx;
+        margin-top: 8rpx;
+
+        .tag_item {
+          font-size: 20rpx;
+          padding: 2rpx 10rpx;
+          border-radius: 6rpx;
+          white-space: nowrap;
+
+          &.tag_blue {
+            color: #2979ff;
+            border: 1rpx solid #2979ff;
+            background-color: rgba(41, 121, 255, 0.05);
+          }
+
+          &.tag_green {
+            color: #19be6b;
+            border: 1rpx solid #19be6b;
+            background-color: rgba(25, 190, 107, 0.05);
+          }
+        }
+      }
+
+      .product_price_row {
+        display: flex;
+        justify-content: space-between;
+        align-items: baseline;
+        margin-top: 12rpx;
+
+        .price_box {
+          color: #ff2a2a;
+          font-weight: bold;
+
+          .price_symbol {
+            font-size: 24rpx;
+          }
+
+          .price_val {
+            font-size: 38rpx;
+          }
+        }
+
+        .sales_val {
+          font-size: 24rpx;
+          color: #999999;
+        }
+      }
+    }
+  }
+
+  .empty_box {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    padding-top: 120rpx;
+
+    .empty_img {
+      width: 160rpx;
+      height: 160rpx;
+    }
+
+    .empty_text {
+      font-size: 26rpx;
+      color: #999999;
+      margin-top: 20rpx;
+    }
+  }
+}
+</style>
diff --git a/pages/sort/sort.vue b/pages/sort/sort.vue
index 4bcb394..2e492c3 100644
--- a/pages/sort/sort.vue
+++ b/pages/sort/sort.vue
@@ -1,7 +1,7 @@
 <template>
   <view class="sort_warp" :class="platformType ? '' : 'iosplatformType'">
     <!-- #ifndef MP-WEIXIN -->
-    <TopSafe></TopSafe>
+    <TopSafe bgColor="#F2EBFF"></TopSafe>
     <!-- #endif -->
 
     <!-- 顶部固定区域：搜索 + 分类区域 -->
@@ -67,8 +67,8 @@
 
       <!-- 左侧分类侧边栏 -->
       <scroll-view class="left_sidebar_scroll" scroll-y>
-        <view class="sidebar_item" v-for="(item, index) in categoryList" :key="item.id || index"
-          :class="{ active: currentCategoryIndex === index }" @click="selectCategory(index)">
+        <view class="sidebar_item" v-for="(item, index) in subCategoryList" :key="item.id || index"
+          :class="{ active: currentSubCategoryIndex === index }" @click="selectSubCategory(index)">
           <text class="sidebar_name">{{ item.name }}</text>
         </view>
       </scroll-view>
@@ -77,28 +77,50 @@
       <view class="right_content_area">
         <!-- 排序栏 -->
         <view class="sort_option_bar">
-          <view class="cat_title_text">{{ currentCategory ? currentCategory.name : '' }}</view>
+          <view></view>
+          <!-- <view class="cat_title_text">{{ currentCategory ? currentCategory.name : '' }}</view> -->
           <view class="sort_actions">
-            <view class="sort_item" :class="{ active: sortType === 'default' }" @click="setSort('default')">
-              综合 <text class="sort_arrow">⇅</text>
+            <view class="sort_item" :class="{ active: sortBy === 'relevance' }" @click="setSort('relevance')">
+              <text>综合</text>
+              <view class="sort_icon_box">
+                <u-icon name="arrow-up-fill" size="10rpx"
+                  :color="sortBy === 'relevance' && sortOrder === 'asc' ? '#7a35f6' : '#cccccc'"
+                  class="icon_up"></u-icon>
+                <u-icon name="arrow-down-fill" size="10rpx"
+                  :color="sortBy === 'relevance' && sortOrder === 'desc' ? '#7a35f6' : '#cccccc'"
+                  class="icon_down"></u-icon>
+              </view>
             </view>
-            <view class="sort_item" :class="{ active: sortType === 'sales' }" @click="setSort('sales')">
-              销量 <text class="sort_arrow">⇅</text>
+            <view class="sort_item" :class="{ active: sortBy === 'sales' }" @click="setSort('sales')">
+              <text>销量</text>
+              <view class="sort_icon_box">
+                <u-icon name="arrow-up-fill" size="10rpx"
+                  :color="sortBy === 'sales' && sortOrder === 'asc' ? '#7a35f6' : '#cccccc'" class="icon_up"></u-icon>
+                <u-icon name="arrow-down-fill" size="10rpx"
+                  :color="sortBy === 'sales' && sortOrder === 'desc' ? '#7a35f6' : '#cccccc'"
+                  class="icon_down"></u-icon>
+              </view>
             </view>
-            <view class="sort_item" :class="{ active: sortType === 'price' }" @click="setSort('price')">
-              价格 <text class="sort_arrow">⇅</text>
+            <view class="sort_item" :class="{ active: sortBy === 'price' }" @click="setSort('price')">
+              <text>价格</text>
+              <view class="sort_icon_box">
+                <u-icon name="arrow-up-fill" size="10rpx"
+                  :color="sortBy === 'price' && sortOrder === 'asc' ? '#7a35f6' : '#cccccc'" class="icon_up"></u-icon>
+                <u-icon name="arrow-down-fill" size="10rpx"
+                  :color="sortBy === 'price' && sortOrder === 'desc' ? '#7a35f6' : '#cccccc'"
+                  class="icon_down"></u-icon>
+              </view>
             </view>
           </view>
         </view>
 
         <!-- 商品列表 -->
-        <scroll-view class="product_list_scroll" scroll-y>
+        <scroll-view class="product_list_scroll" scroll-y @scrolltolower="onReachBottomGoods" :lower-threshold="50">
           <view class="product_list_box" v-if="displayProducts && displayProducts.length > 0">
             <view class="product_row_card" v-for="(item, index) in displayProducts" :key="item.id || index"
               @click="jumpInfo(item)">
               <view class="product_img_box">
-                <image class="product_img" :src="item.image || item.icon || defaultProductImg" mode="aspectFill"
-                  lazy-load />
+                <image class="product_img" :src="item.url || defaultProductImg" mode="aspectFill" lazy-load />
               </view>
               <view class="product_info_box">
                 <view class="product_title">{{ item.name || item.title }}</view>
@@ -119,8 +141,12 @@
                 </view>
               </view>
             </view>
+
+            <!-- 加载更多与无数据状态提示 -->
+            <view class="load_more_tips" v-if="loadingMore">加载中...</view>
+            <view class="load_more_tips" v-else-if="noMore && displayProducts.length > 0">没有更多了</view>
           </view>
-          <view class="empty_box" v-else>
+          <view class="empty_box" v-else-if="!loading">
             <image src="https://static.tbmall.xin/static/not_shopping.png" class="empty_img" />
             <text class="empty_text">暂无商品数据</text>
           </view>
@@ -136,166 +162,32 @@
 
 <script>
 import { getCascadeCategory } from "@/api/common.js";
+import { searchList } from "@/api/product.js";
 import CustomTabBar from "@/components/custom-tab-bar.vue";
 import TopSafe from "@/components/common/top-safe.nvue";
 
-// 假数据列表：当后端接口未就绪时自动提供高保真模拟数据
-const MOCK_CATEGORIES = [
-  {
-    id: 101,
-    name: '有机食品',
-    icon: 'https://static.tbmall.xin/static/new-home/xinren.png',
-    foods: [
-      {
-        id: 1001,
-        name: '鲜8有机贝贝南瓜2500g粉糯板栗味自然生长不催熟',
-        title: '鲜8有机贝贝南瓜2500g粉糯板栗味自然生长不催熟',
-        price: '39.00',
-        sales: 888,
-        tags: ['专业检测', '生态有机'],
-        image: 'https://static.tbmall.xin/static/new-home/nangua.png'
-      },
-      {
-        id: 1002,
-        name: '采缇国产车厘子5kg4j大连美早樱桃生鲜次日达樱桃',
-        title: '采缇国产车厘子5kg4j大连美早樱桃生鲜次日达樱桃',
-        price: '26.99',
-        sales: 888,
-        tags: ['专业检测', '生态有机'],
-        image: 'https://static.tbmall.xin/static/new-home/baokuan.png'
-      },
-      {
-        id: 1003,
-        name: '江苏白凤水蜜桃 应季水果 &新鲜礼盒装',
-        title: '江苏白凤水蜜桃 应季水果 &新鲜礼盒装',
-        price: '34.88',
-        sales: 888,
-        tags: ['专业检测', '生态有机'],
-        image: 'https://static.tbmall.xin/static/new-home/cart.png'
-      },
-      {
-        id: 1004,
-        name: '季新鲜 &进口山竹时令 &老树麻竹整箱送礼',
-        title: '季新鲜 &进口山竹时令 &老树麻竹整箱送礼',
-        price: '52.00',
-        sales: 888,
-        tags: ['专业检测', '生态有机'],
-        image: 'https://static.tbmall.xin/static/new-home/huiyuan.png'
-      }
-    ]
-  },
-  {
-    id: 102,
-    name: '生鲜食材',
-    icon: 'https://static.tbmall.xin/static/new-home/baokuan.png',
-    foods: [
-      {
-        id: 1005,
-        name: '精选新鲜三文鱼中段切片 200g刺身级',
-        title: '精选新鲜三文鱼中段切片 200g刺身级',
-        price: '59.90',
-        sales: 1200,
-        tags: ['冷链速达', '产地直供'],
-        image: 'https://static.tbmall.xin/static/new-home/baokuan.png'
-      },
-      {
-        id: 1006,
-        name: '澳洲进口谷饲安格斯原切雪花牛肉卷 500g',
-        title: '澳洲进口谷饲安格斯原切雪花牛肉卷 500g',
-        price: '89.00',
-        sales: 650,
-        tags: ['原切牛肉', '品质严选'],
-        image: 'https://static.tbmall.xin/static/new-home/cart.png'
-      }
-    ]
-  },
-  {
-    id: 103,
-    name: '米面粮油',
-    icon: 'https://static.tbmall.xin/static/new-home/cart.png',
-    foods: [
-      {
-        id: 1007,
-        name: '五常大米 优质长粒香米 5kg真空包装',
-        title: '五常大米 优质长粒香米 5kg真空包装',
-        price: '49.90',
-        sales: 3400,
-        tags: ['核心产区', '自然醇香'],
-        image: 'https://static.tbmall.xin/static/new-home/xinren.png'
-      }
-    ]
-  },
-  {
-    id: 104,
-    name: '零食饮料',
-    icon: 'https://static.tbmall.xin/static/new-home/huiyuan.png',
-    foods: [
-      {
-        id: 1008,
-        name: '花生造黑松露黑麦苏打饼干 590g*2盒',
-        title: '花生造黑松露黑麦苏打饼干 590g*2盒',
-        price: '29.90',
-        sales: 2300,
-        tags: ['零反式脂肪酸', '拒绝油炸'],
-        image: 'https://static.tbmall.xin/static/new-home/huiyuan.png'
-      }
-    ]
-  },
-  {
-    id: 105,
-    name: '滋补养生',
-    icon: 'https://static.tbmall.xin/static/new-home/xinren.png',
-    foods: [
-      {
-        id: 1009,
-        name: '青海野生黑枸杞干果 250g特级罐装',
-        title: '青海野生黑枸杞干果 250g特级罐装',
-        price: '78.00',
-        sales: 510,
-        tags: ['正宗原产', '花青素丰富'],
-        image: 'https://static.tbmall.xin/static/new-home/nangua.png'
-      }
-    ]
-  },
-  {
-    id: 106,
-    name: '非遗传承',
-    icon: 'https://static.tbmall.xin/static/new-home/baokuan.png',
-    foods: []
-  },
-  {
-    id: 107,
-    name: '家居百货',
-    icon: 'https://static.tbmall.xin/static/new-home/cart.png',
-    foods: []
-  },
-  {
-    id: 108,
-    name: '美妆护肤',
-    icon: 'https://static.tbmall.xin/static/new-home/huiyuan.png',
-    foods: []
-  },
-  {
-    id: 109,
-    name: '其他特色',
-    icon: 'https://static.tbmall.xin/static/new-home/xinren.png',
-    foods: []
-  }
-];
-
 export default {
   components: { CustomTabBar, TopSafe },
   data() {
     return {
       platformType: true,
-      currentCategoryIndex: 0,
+      categoryList: [],           // 一级分类列表 (parentId = 0)
+      currentCategoryIndex: 0,    // 当前选中的一级分类索引
+      subCategoryList: [],        // 二级分类列表 (parentId = 一级ID)
+      currentSubCategoryIndex: 0, // 当前选中的二级分类索引
+      displayProducts: [],        // 三级商品列表 (goods/searchList)
       showAllCategories: false,
-      sortType: 'default', // default | sales | price
-      sortAsc: true,
-      categoryList: [],
+      sortBy: 'relevance',        // 'relevance' | 'sales' | 'price'
+      sortOrder: 'asc',           // 'asc' | 'desc'
       capsuleTop: 0,
       defaultIcon: 'https://static.tbmall.xin/static/new-home/xinren.png',
-      defaultProductImg: 'https://static.tbmall.xin/static/new-home/nangua.png'
+      defaultProductImg: 'https://static.tbmall.xin/static/new-home/nangua.png',
+      isFromSortShop: false,
+      loading: false,
+      loadingMore: false,
+      noMore: false,
+      page: 1,
+      pageSize: 10
     };
   },
   computed: {
@@ -311,22 +203,8 @@ export default {
     currentCategory() {
       return this.categoryList[this.currentCategoryIndex] || null;
     },
-    displayProducts() {
-      if (!this.currentCategory) return [];
-      let list = this.currentCategory.foods || this.currentCategory.productList || [];
-      if (!list || list.length === 0) return [];
-      list = [...list];
-
-      if (this.sortType === 'sales') {
-        list.sort((a, b) => (Number(b.sales) || 0) - (Number(a.sales) || 0));
-      } else if (this.sortType === 'price') {
-        if (this.sortAsc) {
-          list.sort((a, b) => (Number(a.price) || 0) - (Number(b.price) || 0));
-        } else {
-          list.sort((a, b) => (Number(b.price) || 0) - (Number(a.price) || 0));
-        }
-      }
-      return list;
+    currentSubCategory() {
+      return this.subCategoryList[this.currentSubCategoryIndex] || null;
     }
   },
   onShow() {
@@ -342,42 +220,207 @@ export default {
       if (menu && menu.bottom) {
         this.capsuleTop = menu.bottom + 6;
       }
-    } catch (e) {}
+    } catch (e) { }
     /*#endif*/
 
-    this.fetchCategories();
+    const isBackFromSortShop = this.isFromSortShop;
+    this.isFromSortShop = false;
+
+    this.fetchCategories(isBackFromSortShop);
   },
   methods: {
-    async fetchCategories() {
+    // 异步查询级联分类接口 (common/getCascadeCategory)
+    async getCategoryApi(pId) {
       try {
-        const resp = await getCascadeCategory({ parentId: 0 });
-        if (resp && resp.bizcode === 100 && resp.data && resp.data.length > 0) {
-          this.categoryList = resp.data;
-        } else {
-          this.categoryList = MOCK_CATEGORIES;
+        const resp = await getCascadeCategory({ parentId: pId });
+        if (resp && resp.bizcode === 100 && Array.isArray(resp.data)) {
+          return resp.data;
         }
       } catch (e) {
-        console.log("使用模拟分类数据", e);
-        this.categoryList = MOCK_CATEGORIES;
+        console.error("getCascadeCategory error:", e);
       }
+      return [];
     },
-    selectCategory(index, closePopup = false) {
+
+    // 1. 刚进来获取一级分类 (parentId = 0)
+    async fetchCategories(isBack = false) {
+      try {
+        const topList = await this.getCategoryApi(0);
+        this.categoryList = topList || [];
+      } catch (e) {
+        console.error("获取一级分类失败:", e);
+        this.categoryList = [];
+      }
+
+      if (this.categoryList.length === 0) {
+        this.subCategoryList = [];
+        this.displayProducts = [];
+        return;
+      }
+
+      let targetIndex = 0;
+      if (isBack) {
+        const sortId = uni.getStorageSync("sortId");
+        if (sortId) {
+          let idx = this.categoryList.findIndex(item => item.id === sortId);
+          if (idx !== -1) targetIndex = idx;
+          else if (this.currentCategoryIndex >= 0 && this.currentCategoryIndex < this.categoryList.length) {
+            targetIndex = this.currentCategoryIndex;
+          }
+        }
+      } else {
+        uni.removeStorageSync("sortId");
+        uni.removeStorageSync("subSortId");
+        targetIndex = 0;
+      }
+
+      this.selectCategory(targetIndex, false, isBack);
+    },
+
+    // 2. 选择一级分类，根据其 id 获取二级分类 (parentId = 该一级id)
+    async selectCategory(index, closePopup = false, isBack = false) {
       this.currentCategoryIndex = index;
       if (closePopup) {
         this.showAllCategories = false;
       }
+
+      const category = this.categoryList[index];
+      if (!category || !category.id) {
+        this.subCategoryList = [];
+        this.displayProducts = [];
+        return;
+      }
+
+      uni.setStorageSync("sortId", category.id);
+
+      this.loading = true;
+      try {
+        const subList = await this.getCategoryApi(category.id);
+        this.subCategoryList = subList || [];
+
+        if (this.subCategoryList.length === 0) {
+          this.displayProducts = [];
+          this.loading = false;
+          return;
+        }
+
+        let targetSubIndex = 0;
+        if (isBack) {
+          const subSortId = uni.getStorageSync("subSortId");
+          if (subSortId) {
+            let sIdx = this.subCategoryList.findIndex(item => item.id === subSortId);
+            if (sIdx !== -1) targetSubIndex = sIdx;
+          }
+        }
+
+        this.selectSubCategory(targetSubIndex);
+      } catch (e) {
+        console.error("获取二级分类失败:", e);
+        this.subCategoryList = [];
+        this.displayProducts = [];
+        this.loading = false;
+      }
     },
+
+    // 3. 选择二级分类，更新当前二级分类并调用 goods/searchList 获取商品列表
+    selectSubCategory(subIndex) {
+      this.currentSubCategoryIndex = subIndex;
+      const subCat = this.subCategoryList[subIndex];
+      if (subCat && subCat.id) {
+        uni.setStorageSync("subSortId", subCat.id);
+      }
+
+      this.fetchGoodsList(false);
+    },
+
+    // 4. 调用 /goods/searchList 接口获取商品列表 (支持分页与排序)
+    async fetchGoodsList(isLoadMore = false) {
+      const currentSubCat = this.subCategoryList[this.currentSubCategoryIndex];
+      if (!currentSubCat || !currentSubCat.id) {
+        this.displayProducts = [];
+        this.loading = false;
+        this.loadingMore = false;
+        return;
+      }
+
+      if (isLoadMore) {
+        if (this.loadingMore || this.noMore) return;
+        this.loadingMore = true;
+        this.page++;
+      } else {
+        this.loading = true;
+        this.page = 1;
+        this.noMore = false;
+      }
+
+      const params = {
+        categoryId: currentSubCat.id,
+        page: this.page,
+        pageSize: this.pageSize,
+        sortBy: this.sortBy,
+        sortOrder: this.sortOrder
+      };
+
+      try {
+        const resp = await searchList(params);
+        if (resp && resp.bizcode === 100) {
+          let list = [];
+          if (Array.isArray(resp.data)) {
+            list = resp.data;
+          } else if (resp.data && Array.isArray(resp.data.entitys)) {
+            list = resp.data.entitys;
+          } else if (resp.data && Array.isArray(resp.data.list)) {
+            list = resp.data.list;
+          }
+
+          if (isLoadMore) {
+            this.displayProducts = [...this.displayProducts, ...list];
+          } else {
+            this.displayProducts = list;
+          }
+
+          if (list.length < this.pageSize) {
+            this.noMore = true;
+          }
+        } else {
+          if (!isLoadMore) {
+            this.displayProducts = [];
+          }
+          this.noMore = true;
+        }
+      } catch (e) {
+        console.error("searchList error:", e);
+        if (!isLoadMore) {
+          this.displayProducts = [];
+        }
+      } finally {
+        this.loading = false;
+        this.loadingMore = false;
+      }
+    },
+
+    // 5. 右侧商品列表触底触发分页加载
+    onReachBottomGoods() {
+      if (!this.noMore && !this.loadingMore && !this.loading) {
+        this.fetchGoodsList(true);
+      }
+    },
+
     toggleAllCategories() {
       this.showAllCategories = !this.showAllCategories;
     },
+
+    // 6. 排序作用于 goods/searchList 接口
     setSort(type) {
-      if (this.sortType === type && type === 'price') {
-        this.sortAsc = !this.sortAsc;
+      if (this.sortBy === type) {
+        this.sortOrder = this.sortOrder === 'asc' ? 'desc' : 'asc';
       } else {
-        this.sortType = type;
-        this.sortAsc = true;
+        this.sortBy = type;
+        this.sortOrder = 'asc';
       }
+      this.fetchGoodsList(false);
     },
+
     limit999(n) {
       const num = Number(n);
       if (isNaN(num) || num < 10000) {
@@ -385,12 +428,15 @@ export default {
       }
       return `${Math.floor(num / 10000)}万+`;
     },
+
     jumpSearch() {
       uni.navigateTo({
         url: "/pages/rwa_package/insights/search",
       });
     },
+
     jumpInfo(item) {
+      this.isFromSortShop = true;
       uni.navigateTo({
         url: `/pages/rwa_package/shop/sort-shop?id=${item.id}&name=${encodeURIComponent(item.name || item.title || '')}`,
       });
@@ -422,9 +468,12 @@ page {
 .top_fixed_header {
   position: relative;
   z-index: 100;
-  background: #ffffff;
+  background: linear-gradient(180deg, #F2EBFF 0%, #FFFFFF 100%);
+  border-bottom-left-radius: 36rpx;
+  border-bottom-right-radius: 36rpx;
+  overflow: hidden;
   flex-shrink: 0;
-  box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.03);
+  box-shadow: none;
   transition: all 0.2s;
 
   &.is_expanded {
@@ -693,7 +742,7 @@ page {
   display: flex;
   align-items: center;
   justify-content: space-between;
-  border-bottom: 1rpx solid #f5f5f5;
+  border-bottom: none;
   flex-shrink: 0;
 
   .cat_title_text {
@@ -712,15 +761,24 @@ page {
       color: #999999;
       display: flex;
       align-items: center;
+      cursor: pointer;
 
       &.active {
         color: #7a35f6;
         font-weight: bold;
       }
 
-      .sort_arrow {
-        font-size: 20rpx;
-        margin-left: 4rpx;
+      .sort_icon_box {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
+        margin-left: 6rpx;
+        line-height: 1;
+
+        .icon_up {
+          margin-bottom: 2rpx;
+        }
       }
     }
   }
@@ -853,5 +911,12 @@ page {
       margin-top: 20rpx;
     }
   }
+
+  .load_more_tips {
+    text-align: center;
+    font-size: 24rpx;
+    color: #999999;
+    padding: 24rpx 0;
+  }
 }
 </style>