From 5889bef48ee984bc4afac3859a496b164d436598 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AF=85?= <1335909236@qq.com>
Date: Wed, 16 Jul 2025 10:15:43 +0800
Subject: [PATCH 1/7] =?UTF-8?q?feat:=E6=88=91=E7=9A=84=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=20-=20=E5=BE=85=E4=BB=98=E6=AC=BE=20=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/myOrders/index/index.vue        |  42 ++---
 packages/myOrders/orderDetails/index.css | 207 +++++++++++++++++++++++
 packages/myOrders/orderDetails/index.vue | 207 +++++++++++++++++++++++
 pages.json                               |   6 +
 4 files changed, 442 insertions(+), 20 deletions(-)
 create mode 100644 packages/myOrders/orderDetails/index.css
 create mode 100644 packages/myOrders/orderDetails/index.vue

diff --git a/packages/myOrders/index/index.vue b/packages/myOrders/index/index.vue
index 389c7fb2..6e6383c9 100644
--- a/packages/myOrders/index/index.vue
+++ b/packages/myOrders/index/index.vue
@@ -15,7 +15,7 @@
       <view v-for="(category, catIndex) in categoryList" :key="catIndex">
         <view v-if="selectedTab === catIndex">
           <view v-for="(item, index) in orderData" :key="index">
-            <view class="contentList">
+            <view class="contentList" @click="toDetails">
               <!-- 订单头部信息 -->
               <view class="order-header">
                 <text>提交订单：{{ item.createTime }}</text>
@@ -54,6 +54,8 @@
   </view>
 </template>
 <script>
+import { picUrl, NavgateTo } from '../../../utils';
+
 export default {
   data() {
     return {
@@ -70,11 +72,11 @@ export default {
           createTime: "2025-07-15 23:23:23",
           status: "待付款",
           goodsList: [
-            { image: "/static/logo.png" },
-            { image: "/static/logo.png" },
-            { image: "/static/logo.png" },
-            { image: "/static/logo.png" },
-            { image: "/static/logo.png" },
+            { image: "http://localhost:8080/order_index1.png" },
+            { image: "http://localhost:8080/order_index2.png" },
+            { image: "http://localhost:8080/order_index3.png" },
+            { image: "http://localhost:8080/order_index4.png" },
+            { image: "http://localhost:8080/order_index5.png" },
           ],
           totalCount: 1,
           totalPrice: "¥4704.00",
@@ -83,11 +85,11 @@ export default {
           createTime: "2025-07-15 23:23:23",
           status: "待发货",
           goodsList: [
-            { image: "/static/logo.png" },
-            { image: "/static/logo.png" },
-            { image: "/static/logo.png" },
-            { image: "/static/logo.png" },
-            { image: "/static/logo.png" },
+            { image: "http://localhost:8080/order_index1.png" },
+            { image: "http://localhost:8080/order_index2.png" },
+            { image: "http://localhost:8080/order_index3.png" },
+            { image: "http://localhost:8080/order_index4.png" },
+            { image: "http://localhost:8080/order_index5.png" },
           ],
           totalCount: 2,
           totalPrice: "¥4704.00",
@@ -96,11 +98,11 @@ export default {
           createTime: "2025-07-15 23:23:23",
           status: "已取消",
           goodsList: [
-            { image: "/static/logo.png" },
-            { image: "/static/logo.png" },
-            { image: "/static/logo.png" },
-            { image: "/static/logo.png" },
-            { image: "/static/logo.png" },
+            { image: "http://localhost:8080/order_index1.png" },
+            { image: "http://localhost:8080/order_index2.png" },
+            { image: "http://localhost:8080/order_index3.png" },
+            { image: "http://localhost:8080/order_index4.png" },
+            { image: "http://localhost:8080/order_index5.png" },
           ],
           totalCount: 3,
           totalPrice: "¥4704.00",
@@ -125,10 +127,10 @@ export default {
       });
     },
     goToPay() {
-      // 跳转到支付页面
-      uni.navigateTo({
-        url: "/kitchen/pay/index",
-      });
+      console.log("🚀 ~ goToPay ~ goToPay:", "去支付...");
+    },
+    toDetails() {
+      NavgateTo("/packages/myOrders/orderDetails/index");
     },
   },
 };
diff --git a/packages/myOrders/orderDetails/index.css b/packages/myOrders/orderDetails/index.css
new file mode 100644
index 00000000..779d9d76
--- /dev/null
+++ b/packages/myOrders/orderDetails/index.css
@@ -0,0 +1,207 @@
+/* 基础样式 */
+page {
+    background-color: #f6f7fb;
+}
+
+/* 顶部状态栏 */
+.status-bar {
+    background: linear-gradient(#ff5500, #f5f7fb);
+    color: white;
+    padding: 30rpx 20rpx 20rpx;
+    height: 350rpx;
+}
+
+.status {
+    font-size: 36rpx;
+    font-weight: bold;
+    margin-bottom: 10rpx;
+}
+
+.countdown {
+    font-size: 30rpx;
+    margin: 15rpx 0;
+}
+
+.tips {
+    font-size: 24rpx;
+    opacity: 0.9;
+}
+
+/* 订单金额 */
+.content {
+    margin: -180rpx 15rpx 14rpx;
+}
+
+.amount-section {
+    background: #ffffff;
+    padding: 30rpx 20rpx;
+    border-bottom: 1rpx solid #eee;
+    border-radius: 20rpx;
+}
+
+.total-amount {
+    font-size: 36rpx;
+    font-weight: bold;
+    margin-bottom: 10rpx;
+}
+
+.amount-desc,
+.original-price {
+    font-size: 24rpx;
+    color: #aaaaaa;
+    margin-bottom: 30rpx;
+}
+
+.original-price text {
+    font-size: 24rpx;
+    color: #333;
+    margin-left: 10rpx;
+    font-weight: bold;
+}
+
+/* 商品列表 */
+.goods-list {
+    background: #ffffff;
+    margin-top: 20rpx;
+    padding: 20rpx;
+}
+
+.goods-item {
+    display: flex;
+    margin-bottom: 20rpx;
+    margin-top: 20rpx;
+}
+
+.goods-img {
+    width: 120rpx;
+    height: 120rpx;
+    border-radius: 8rpx;
+    margin-right: 20rpx;
+}
+
+.goods-info {
+    flex: 1;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
+
+.goods-info-right {
+    float: right;
+    color: #a0a0a0;
+}
+
+.goods-name {
+    font-size: 30rpx;
+    margin-bottom: 5rpx;
+}
+
+.goods-desc {
+    font-size: 24rpx;
+    color: #999;
+    margin-bottom: 10rpx;
+}
+
+.goods-price {
+    font-size: 28rpx;
+}
+
+/* 信息区块通用样式 */
+.order-info,
+.delivery-info,
+.recipient-info,
+.order-detail-info {
+    background: #ffffff;
+    margin-top: 20rpx;
+    padding: 20rpx;
+    border-radius: 20rpx;
+}
+
+.section-title {
+    font-size: 30rpx;
+    font-weight: bold;
+    margin-bottom: 20rpx;
+    color: #333;
+}
+
+.hr {
+    height: 1rpx;
+    margin: 20rpx 0;
+    background: #f5f7fb;
+}
+
+.info-item {
+    display: flex;
+    justify-content: space-between;
+    padding: 15rpx 0;
+    border-bottom: 1rpx solid #f5f5f5;
+    font-size: 28rpx;
+}
+
+.info-item:last-child {
+    border-bottom: none;
+}
+
+.info-label1 {
+    font-size: 28rpx;
+    font-weight: bold;
+    margin-bottom: 20rpx;
+    color: #333;
+}
+
+.info-label {
+    color: #a7a7a7;
+    font-size: 26rpx;
+}
+
+.info-value {
+    color: #333;
+    font-size: 26rpx;
+}
+
+.info-value text{
+    color: #f64927;
+    font-size: 26rpx;
+    margin-left: 10rpx;
+}
+
+.info-action {
+    color: #a5a5a5;
+    margin-left: 20rpx;
+    font-size: 26rpx;
+}
+
+/* 底部按钮 */
+.bottom-buttons {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    display: flex;
+    background: #ffffff;
+    padding: 20rpx;
+    box-shadow: 0 -2rpx 10rpx rgba(0, 0, 0, 0.1);
+}
+
+.cancel-btn {
+    flex: 1;
+    height: 80rpx;
+    background: #d9d9d9;
+    color: #333;
+    border: 1rpx solid #ddd;
+    border-radius: 8rpx;
+    margin-right: 20rpx;
+    font-size: 30rpx;
+    border-radius: 50rpx;
+}
+
+.pay-btn {
+    flex: 1;
+    height: 80rpx;
+    background: #FF5252;
+    color: white;
+    border: none;
+    border-radius: 8rpx;
+    font-size: 30rpx;
+    border-radius: 50rpx;
+}
\ No newline at end of file
diff --git a/packages/myOrders/orderDetails/index.vue b/packages/myOrders/orderDetails/index.vue
new file mode 100644
index 00000000..2830680f
--- /dev/null
+++ b/packages/myOrders/orderDetails/index.vue
@@ -0,0 +1,207 @@
+<template>
+  <view class="container">
+    <!-- 顶部状态栏 -->
+    <view class="status-bar">
+      <view class="status">待付款</view>
+      <view class="countdown">剩余支付时间: {{ countdown }}</view>
+      <view class="tips">10分钟内未支付订单自动取消</view>
+    </view>
+
+    <view class="content">
+      <!-- 订单金额 -->
+      <view class="amount-section">
+        <view class="total-amount">¥{{ orderInfo.totalAmount }}</view>
+        <view class="original-price"
+          >商品下单应付
+          <text> ¥{{ orderInfo.originalPrice }}</text>
+        </view>
+        <view
+          class="goods-item"
+          v-for="(item, index) in orderInfo.goodsList"
+          :key="index"
+        >
+          <image :src="item.image" class="goods-img"></image>
+          <view class="goods-info">
+            <view>
+              <view class="goods-name">{{ item.name }}</view>
+              <view class="goods-desc">{{ item.desc }}</view>
+            </view>
+            <view>
+              <view class="goods-price">¥{{ item.price }}</view>
+              <view class="goods-info-right"> x{{ item.quantity }}</view>
+            </view>
+          </view>
+        </view>
+        <view class="hr"></view>
+        <view class="info-item">
+          <view class="info-label1"
+            >下单总金额( ¥{{ orderInfo.orderAmount }} )</view
+          >
+          <view class="info-action">明细</view>
+        </view>
+        <view class="info-item">
+          <view class="info-label">商品下单总金额</view>
+          <view class="info-value">¥{{ orderInfo.goodsTotal }}</view>
+        </view>
+        <view class="info-item">
+          <view class="info-label">运费总计</view>
+          <view class="info-value">¥{{ orderInfo.freight }}</view>
+        </view>
+      </view>
+
+      <!-- 配送信息 -->
+      <view class="delivery-info">
+        <view class="section-title">配送信息</view>
+        <view class="info-item">
+          <view class="info-label">配送方式</view>
+          <view class="info-value">{{ orderInfo.deliveryType }}</view>
+        </view>
+        <view class="info-item">
+          <view class="info-label">预计配送时间</view>
+          <view class="info-value">{{ orderInfo.deliveryTime }}</view>
+        </view>
+      </view>
+
+      <!-- 收货信息 -->
+      <view class="recipient-info">
+        <view class="section-title">收货信息</view>
+        <view class="info-item">
+          <view class="info-label">收货人</view>
+          <view class="info-value"
+            >{{ orderInfo.recipientName }}
+            <text> {{ orderInfo.recipientPhone }}</text>
+          </view>
+        </view>
+        <view class="info-item">
+          <view class="info-label">收货地址</view>
+          <view class="info-value">{{ orderInfo.recipientAddress }}</view>
+        </view>
+      </view>
+
+      <!-- 订单信息详情 -->
+      <view class="order-detail-info">
+        <view class="section-title">订单信息</view>
+        <view class="info-item">
+          <view class="info-label">订单编号</view>
+          <view class="info-value">{{ orderInfo.orderNumber }}</view>
+        </view>
+        <view class="info-item">
+          <view class="info-label">支付方式</view>
+          <view class="info-value">{{ orderInfo.paymentMethod }}</view>
+        </view>
+        <view class="info-item">
+          <view class="info-label">下单时间</view>
+          <view class="info-value">{{ orderInfo.orderTime }}</view>
+        </view>
+        <view class="info-item">
+          <view class="info-label">备注</view>
+          <view class="info-value">{{ orderInfo.remark }}</view>
+        </view>
+      </view>
+
+      <!-- 底部操作按钮 -->
+      <view class="bottom-buttons">
+        <button class="cancel-btn" @click="cancelOrder">取消订单</button>
+        <button class="pay-btn" @click="gotoPayment">立即支付</button>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      countdown: "9:59:59",
+      orderInfo: {
+        totalAmount: "4704.00",
+        payAmount: "4704.00",
+        originalPrice: "4704.00",
+        orderAmount: "290.00",
+        goodsTotal: "4704.00",
+        freight: "4704.00",
+        deliveryType: "商家配送",
+        deliveryTime: "2021-04-16 20:00-22:00",
+        recipientName: "杜先生",
+        recipientPhone: "15901518415",
+        recipientAddress: "河北省衡水市桃城区上海公馆",
+        orderNumber: "159144551545654",
+        paymentMethod: "微信支付",
+        orderTime: "2021-03-16 20:00-22:00",
+        remark: "明天9点之前送到",
+        goodsList: [
+          {
+            image: "http://localhost:8080/order_details.png",
+            name: "泰国金枕榴莲",
+            desc: "泰国金枕榴莲 软糯 香甜",
+            price: "125.9",
+            quantity: 1,
+          },
+          {
+            image: "http://localhost:8080/order_details.png",
+            name: "泰国金枕榴莲",
+            desc: "泰国金枕榴莲 软糯 香甜",
+            price: "125.9",
+            quantity: 1,
+          },
+          {
+            image: "http://localhost:8080/order_details.png",
+            name: "泰国金枕榴莲",
+            desc: "泰国金枕榴莲 软糯 香甜",
+            price: "125.9",
+            quantity: 1,
+          },
+        ],
+      },
+    };
+  },
+  onLoad() {
+    // 启动倒计时
+    this.startCountdown();
+  },
+  methods: {
+    startCountdown() {
+      // 实际项目中应该从服务器获取剩余时间
+      // 这里使用模拟倒计时
+      let seconds = 10 * 60; // 10分钟
+      const timer = setInterval(() => {
+        seconds--;
+        const hours = Math.floor(seconds / 3600);
+        const minutes = Math.floor((seconds % 3600) / 60);
+        const secs = seconds % 60;
+        this.countdown = `${hours}:${minutes.toString().padStart(2, "0")}:${secs
+          .toString()
+          .padStart(2, "0")}`;
+        if (seconds <= 0) {
+          clearInterval(timer);
+          // 倒计时结束，处理订单取消逻辑
+          uni.showToast({ title: "订单已取消", icon: "none" });
+          setTimeout(() => uni.navigateBack(), 1500);
+        }
+      }, 1000);
+    },
+    cancelOrder() {
+      uni.showModal({
+        title: "提示",
+        content: "确定要取消订单吗？",
+        success: (res) => {
+          if (res.confirm) {
+            // 调用取消订单API
+            uni.showToast({ title: "订单已取消", icon: "none" });
+            setTimeout(() => uni.navigateBack(), 1500);
+          }
+        },
+      });
+    },
+    gotoPayment() {
+      // 跳转到支付页面
+      uni.navigateTo({
+        url: "/kitchen/pay/index",
+      });
+    },
+  },
+};
+</script>
+<style>
+@import url("./index.css");
+</style>
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 3eb7100a..7d03fbbf 100644
--- a/pages.json
+++ b/pages.json
@@ -737,6 +737,12 @@
 					"style": {
 						"navigationBarTitleText": "我的订单"
 					}
+				},
+				{
+					"path": "orderDetails/index",
+					"style": {
+						"navigationBarTitleText": "我的订单"
+					}
 				}
 			]
 		}

From 1852c984630bdff1f11640c276b5ee390df0d321 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AF=85?= <1335909236@qq.com>
Date: Wed, 16 Jul 2025 18:17:59 +0800
Subject: [PATCH 2/7] =?UTF-8?q?feat:=E6=88=91=E7=9A=84=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/myOrders/index/index.css        |  34 +++-
 packages/myOrders/index/index.vue        | 115 ++++++++++--
 packages/myOrders/logistics/index.css    | 215 +++++++++++++++++++++++
 packages/myOrders/logistics/index.vue    | 169 ++++++++++++++++++
 packages/myOrders/orderDetails/index.css |  38 +++-
 packages/myOrders/orderDetails/index.vue | 200 ++++++++++++++-------
 pages.json                               |   6 +
 7 files changed, 693 insertions(+), 84 deletions(-)
 create mode 100644 packages/myOrders/logistics/index.css
 create mode 100644 packages/myOrders/logistics/index.vue

diff --git a/packages/myOrders/index/index.css b/packages/myOrders/index/index.css
index e484c0d9..f3ad47ab 100644
--- a/packages/myOrders/index/index.css
+++ b/packages/myOrders/index/index.css
@@ -49,6 +49,7 @@ page {
 .order-header {
     display: flex;
     justify-content: space-between;
+    align-items: center;
     padding: 20rpx;
     font-size: 24rpx;
     color: #a3a3a3;
@@ -60,6 +61,26 @@ page {
     font-weight: bold;
 }
 
+.status2 {
+    color: #333;
+    font-weight: bold;
+    border: 1rpx solid #f83d19;
+    display: flex;
+    padding: 10rpx;
+    border-radius: 10rpx;
+}
+
+.status2 img {
+    width: 30rpx;
+    height: 30rpx;
+    margin-right: 10rpx;
+}
+
+.status3 {
+    color: #949494;
+    font-weight: bold;
+}
+
 .goods-list {
     display: flex;
     flex-wrap: wrap;
@@ -90,7 +111,7 @@ page {
     justify-content: flex-end;
 }
 
-.order-footer-text text{
+.order-footer-text text {
     color: #ff3710;
     margin-left: 10rpx;
     font-weight: bold;
@@ -110,6 +131,17 @@ page {
     border: 1rpx solid #ddd;
     border-radius: 30rpx;
     font-size: 24rpx;
+    margin: 0;
+}
+
+.yfd-btn {
+    width: 160rpx;
+    height: 60rpx;
+    background: #ffebcb;
+    color: #802002;
+    border: none;
+    border-radius: 30rpx;
+    font-size: 24rpx;
     margin: 0 20rpx;
 }
 
diff --git a/packages/myOrders/index/index.vue b/packages/myOrders/index/index.vue
index 6e6383c9..abb3b64c 100644
--- a/packages/myOrders/index/index.vue
+++ b/packages/myOrders/index/index.vue
@@ -15,15 +15,26 @@
       <view v-for="(category, catIndex) in categoryList" :key="catIndex">
         <view v-if="selectedTab === catIndex">
           <view v-for="(item, index) in orderData" :key="index">
-            <view class="contentList" @click="toDetails">
+            <view class="contentList">
               <!-- 订单头部信息 -->
-              <view class="order-header">
+              <view class="order-header" @click="toDetails(item.status)">
                 <text>提交订单：{{ item.createTime }}</text>
-                <text class="status">{{ item.status }}</text>
+                <view
+                  v-if="item.status == '已取消' || item.status == '已完成'"
+                  class="status3"
+                  >{{ item.status }}</view
+                >
+                <view v-else-if="item.status == '退款中'" class="status2">
+                  <img
+                    src="http://localhost:8080/refund.png"
+                  />
+                  {{ item.status }}
+                </view>
+                <view v-else class="status">{{ item.status }}</view>
               </view>
 
               <!-- 商品列表 -->
-              <view class="goods-list">
+              <view class="goods-list" @click="toDetails(item.status)">
                 <view
                   v-for="(goods, goodsIndex) in item.goodsList"
                   :key="goodsIndex"
@@ -35,15 +46,50 @@
 
               <!-- 订单底部信息 -->
               <view class="order-footer">
-                <view class="order-footer-text"
+                <view class="order-footer-text" @click="toDetails(item.status)"
                   >共{{ item.totalCount }}件商品，共计
                   <text> {{ item.totalPrice }}</text>
                 </view>
-                <view class="btn-group">
-                  <button class="cancel-btn" @click="cancelOrder">
-                    取消订单
-                  </button>
-                  <button class="pay-btn" @click="goToPay">立即支付</button>
+                <view>
+                  <view class="btn-group" v-if="item.status === '待付款'">
+                    <button class="cancel-btn" @click="cancelOrder">
+                      取消订单
+                    </button>
+                    <button class="yfd-btn" @click="cancelOrder">运费单</button>
+                    <button class="pay-btn" @click="goToPay">立即支付</button>
+                  </view>
+                  <view class="btn-group" v-if="item.status === '待发货'">
+                    <button class="yfd-btn" @click="cancelOrder">运费单</button>
+                  </view>
+                  <view class="btn-group" v-if="item.status === '已取消'">
+                    <button class="yfd-btn" @click="cancelOrder">运费单</button>
+                    <button class="pay-btn" @click="cancelOrder">
+                      再来一单
+                    </button>
+                  </view>
+                  <view class="btn-group" v-if="item.status === '配送中'">
+                    <button class="cancel-btn" @click="checkLogistics">
+                      查看物流
+                    </button>
+                    <button class="yfd-btn" @click="cancelOrder">运费单</button>
+                    <button class="pay-btn" @click="cancelOrder">
+                      再来一单
+                    </button>
+                  </view>
+                  <view class="btn-group" v-if="item.status === '已完成'">
+                    <button class="cancel-btn" @click="cancelOrder">
+                      服务评价
+                    </button>
+                    <button class="yfd-btn" @click="cancelOrder">运费单</button>
+                    <button class="pay-btn" @click="cancelOrder">
+                      再来一单
+                    </button>
+                  </view>
+                  <view class="btn-group" v-if="item.status === '退款中'">
+                    <button class="pay-btn" @click="cancelOrder">
+                      再来一单
+                    </button>
+                  </view>
                 </view>
               </view>
             </view>
@@ -54,7 +100,7 @@
   </view>
 </template>
 <script>
-import { picUrl, NavgateTo } from '../../../utils';
+import { picUrl, NavgateTo } from "../../../utils";
 
 export default {
   data() {
@@ -107,6 +153,45 @@ export default {
           totalCount: 3,
           totalPrice: "¥4704.00",
         },
+        {
+          createTime: "2025-07-15 23:23:23",
+          status: "配送中",
+          goodsList: [
+            { image: "http://localhost:8080/order_index1.png" },
+            { image: "http://localhost:8080/order_index2.png" },
+            { image: "http://localhost:8080/order_index3.png" },
+            { image: "http://localhost:8080/order_index4.png" },
+            { image: "http://localhost:8080/order_index5.png" },
+          ],
+          totalCount: 2,
+          totalPrice: "¥4704.00",
+        },
+        {
+          createTime: "2025-07-15 23:23:23",
+          status: "已完成",
+          goodsList: [
+            { image: "http://localhost:8080/order_index1.png" },
+            { image: "http://localhost:8080/order_index2.png" },
+            { image: "http://localhost:8080/order_index3.png" },
+            { image: "http://localhost:8080/order_index4.png" },
+            { image: "http://localhost:8080/order_index5.png" },
+          ],
+          totalCount: 3,
+          totalPrice: "¥4704.00",
+        },
+        {
+          createTime: "2025-07-15 23:23:23",
+          status: "退款中",
+          goodsList: [
+            { image: "http://localhost:8080/order_index1.png" },
+            { image: "http://localhost:8080/order_index2.png" },
+            { image: "http://localhost:8080/order_index3.png" },
+            { image: "http://localhost:8080/order_index4.png" },
+            { image: "http://localhost:8080/order_index5.png" },
+          ],
+          totalCount: 3,
+          totalPrice: "¥4704.00",
+        },
       ],
     };
   },
@@ -129,8 +214,12 @@ export default {
     goToPay() {
       console.log("🚀 ~ goToPay ~ goToPay:", "去支付...");
     },
-    toDetails() {
-      NavgateTo("/packages/myOrders/orderDetails/index");
+    toDetails(status) {
+      NavgateTo(`/packages/myOrders/orderDetails/index?status=${status}`);
+    },
+
+    checkLogistics() {
+      NavgateTo(`/packages/myOrders/logistics/index`);
     },
   },
 };
diff --git a/packages/myOrders/logistics/index.css b/packages/myOrders/logistics/index.css
new file mode 100644
index 00000000..c0a92506
--- /dev/null
+++ b/packages/myOrders/logistics/index.css
@@ -0,0 +1,215 @@
+/* 全局样式 */
+page {
+    background-color: #f5f7fa;
+    font-family: -apple-system, BlinkMacSystemFont, 'Helvetica Neue', sans-serif;
+    padding-bottom: 10rpx;
+}
+
+.container {
+    padding: 0 10rpx 40rpx;
+}
+
+/* 地图容器 */
+.map-container {
+    height: 110vh;
+    border-radius: 16rpx;
+    overflow: hidden;
+    margin: 30rpx 20rpx;
+    position: relative;
+    box-shadow: 0 8rpx 20rpx rgba(0, 0, 0, 0.08);
+}
+
+/* 卡片通用样式 */
+.address-card,
+.info-card {
+    background: white;
+    border-radius: 16rpx;
+    padding: 30rpx;
+    margin: 0 20rpx 30rpx;
+    box-shadow: 0 8rpx 20rpx rgba(0, 0, 0, 0.05);
+    position: absolute;
+    top: 500rpx;
+    left: 30rpx;
+    right: 30rpx;
+}
+
+/* 信息卡片 */
+.info-row {
+    display: flex;
+    align-items: center;
+    padding: 20rpx 0;
+    border-bottom: 1rpx solid #f0f0f0;
+    justify-content: space-between;
+}
+
+.info-row:last-child {
+    border-bottom: none;
+}
+
+.info-icon {
+    width: 36rpx;
+    height: 36rpx;
+    margin-right: 15rpx;
+}
+
+.info-label {
+    font-size: 28rpx;
+    color: #333;
+    min-width: 120rpx;
+    font-weight: 700;
+}
+
+.info-value {
+    font-size: 28rpx;
+    color: #333;
+    font-weight: 500;
+    /* flex: 1; */
+}
+
+.info-value  text{
+    font-size: 28rpx;
+    color: #f25233;
+    font-weight: 500;
+    margin-left: 15rpx;
+}
+
+.copy-btn {
+    width: 35rpx;
+    height: 35rpx;
+    float: right;
+    margin-left: 20rpx;
+}
+
+/* 时间轴样式 */
+.timeline {
+    position: relative;
+    background: white;
+    border-radius: 16rpx;
+    padding: 30rpx;
+    margin: 0 20rpx;
+    box-shadow: 0 8rpx 20rpx rgba(0, 0, 0, 0.05);
+    position: absolute;
+    top: 820rpx;
+    left: 30rpx;
+    right: 30rpx;
+}
+
+.timeline-title {
+    font-size: 34rpx;
+    font-weight: bold;
+    color: #333;
+    margin-bottom: 30rpx;
+    padding-left: 20rpx;
+    position: relative;
+}
+
+.timeline-title::before {
+    content: '';
+    position: absolute;
+    left: 0;
+    top: 50%;
+    transform: translateY(-50%);
+    width: 8rpx;
+    height: 36rpx;
+    background: #f25233;
+    border-radius: 8rpx;
+}
+
+.timeline-item {
+    position: relative;
+    padding-left: 60rpx;
+    margin-bottom: 40rpx;
+}
+
+.timeline-item:last-child {
+    margin-bottom: 0;
+}
+
+.timeline-dot {
+    position: absolute;
+    left: 20rpx;
+    top: 8rpx;
+    width: 20rpx;
+    height: 20rpx;
+    border-radius: 50%;
+    background: #f25233;
+    z-index: 2;
+}
+
+.timeline-item.active .timeline-dot {
+    background: #ffffff;
+    width: 15rpx;
+    height: 15rpx;
+    left: 22rpx;
+    top: 6rpx;
+    box-shadow: 0 0 0 6rpx #f25233;
+}
+
+.timeline-line {
+    position: absolute;
+    left: 29rpx;
+    top: 28rpx;
+    bottom: -40rpx;
+    width: 2rpx;
+    background: #f25233;
+    z-index: 1;
+}
+
+.timeline-item:last-child .timeline-line {
+    display: none;
+}
+
+.timeline-status {
+    font-size: 32rpx;
+    font-weight: bold;
+    margin-bottom: 8rpx;
+    color: #333;
+}
+
+.timeline-item.active .timeline-status {
+    color: #333;
+}
+
+.timeline-desc {
+    font-size: 28rpx;
+    color: #a3a3a3;
+    margin-bottom: 10rpx;
+    line-height: 1.5;
+}
+
+.driver-details {
+    background: #f9f9f9;
+    border-radius: 10rpx;
+    padding: 15rpx;
+    margin: 15rpx 0;
+}
+
+.detail-item {
+    display: flex;
+    align-items: center;
+    font-size: 26rpx;
+    color: #555;
+    margin-bottom: 10rpx;
+}
+
+.detail-item-phone {
+    font-size: 28rpx;
+    color: #f25233;
+    margin-bottom: 10rpx;
+    margin-left: 20rpx;
+}
+
+.detail-item:last-child {
+    margin-bottom: 0;
+}
+
+.detail-icon {
+    width: 28rpx;
+    height: 28rpx;
+    margin-right: 10rpx;
+}
+
+.timeline-time {
+    font-size: 26rpx;
+    color: #999;
+}
\ No newline at end of file
diff --git a/packages/myOrders/logistics/index.vue b/packages/myOrders/logistics/index.vue
new file mode 100644
index 00000000..10cec369
--- /dev/null
+++ b/packages/myOrders/logistics/index.vue
@@ -0,0 +1,169 @@
+<template>
+  <view class="container">
+    <!-- 地图区域 -->
+    <view class="map-container">
+      <map
+        id="deliveryMap"
+        :latitude="latitude"
+        :longitude="longitude"
+        :markers="markers"
+        :polyline="polyline"
+        :include-points="points"
+        style="width: 100%; height: 110%"
+      >
+      </map>
+    </view>
+
+    <!-- 物流信息 -->
+    <view class="info-card">
+      <view class="info-row">
+        <text class="info-label">运单号</text>
+        <view>
+          <text class="info-value">YD999999</text>
+          <img
+            class="copy-btn"
+            @click="copyNumber"
+            src="http://localhost:8080/copy.png"
+            alt="复制"
+          />
+        </view>
+      </view>
+      <view class="info-row">
+        <text class="info-label">收件人</text>
+        <text class="info-value">
+          小王
+          <text>1388888888</text>
+        </text>
+      </view>
+      <view class="info-row">
+        <text class="info-label">车牌号</text>
+        <text class="info-value">京ALN233</text>
+      </view>
+    </view>
+
+    <!-- 物流时间轴 -->
+    <view class="timeline">
+      <!-- 已签收 -->
+      <view class="timeline-item active">
+        <view class="timeline-dot"></view>
+        <view class="timeline-line"></view>
+        <view class="timeline-content">
+          <view class="timeline-status">已签收</view>
+          <view class="timeline-desc">您的订单已被签收，感谢您的支持</view>
+          <view class="timeline-time">2021-04-16 20:30:24</view>
+        </view>
+      </view>
+
+      <!-- 派送中 -->
+      <view class="timeline-item">
+        <view class="timeline-dot"></view>
+        <view class="timeline-line"></view>
+        <view class="timeline-content">
+          <view class="timeline-status">派送中</view>
+          <view class="timeline-desc">您的订单正在派送中</view>
+          <view class="timeline-desc">
+            <view
+              >配送司机：小王
+              <text class="detail-item-phone">1388888888</text>
+            </view>
+          </view>
+          <view class="timeline-desc">
+            <text>车牌号：京ALN233</text>
+          </view>
+          <view class="timeline-time">2021-04-16 20:06:24</view>
+        </view>
+      </view>
+
+      <!-- 仓库处理 -->
+      <view class="timeline-item">
+        <view class="timeline-dot"></view>
+        <view class="timeline-line"></view>
+        <view class="timeline-content">
+          <view class="timeline-status">仓库处理中</view>
+          <view class="timeline-desc">拣货完成</view>
+          <view class="timeline-time">2021-04-16 20:30:24</view>
+        </view>
+      </view>
+
+      <!-- 已下单 -->
+      <view class="timeline-item">
+        <view class="timeline-dot"></view>
+        <view class="timeline-line"></view>
+        <view class="timeline-content">
+          <view class="timeline-status">已下单</view>
+          <view class="timeline-desc">您提交了订单，预计2020-04-29送达</view>
+          <view class="timeline-time">2021-04-16 20:30:24</view>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      // 坐标
+      latitude: 39.90469,
+      longitude: 116.40717,
+
+      // 地图标记点
+      markers: [
+        {
+          id: 1,
+          latitude: 39.90469,
+          longitude: 116.40717,
+          title: "目的地",
+          iconPath: "/static/destination.png",
+          width: 36,
+          height: 36,
+        },
+        {
+          id: 2,
+          latitude: 39.915,
+          longitude: 116.42,
+          title: "当前位置",
+          iconPath: "/static/current.png",
+          width: 40,
+          height: 40,
+        },
+      ],
+
+      // 配送路线
+      polyline: [
+        {
+          points: [
+            { latitude: 39.915, longitude: 116.42 },
+            { latitude: 39.91, longitude: 116.415 },
+            { latitude: 39.907, longitude: 116.41 },
+            { latitude: 39.90469, longitude: 116.40717 },
+          ],
+          color: "#07C160",
+          width: 6,
+          dottedLine: false,
+        },
+      ],
+
+      // 地图显示区域
+      points: [
+        { latitude: 39.915, longitude: 116.42 },
+        { latitude: 39.90469, longitude: 116.40717 },
+      ],
+    };
+  },
+  methods: {
+    copyNumber() {
+      uni.setClipboardData({
+        data: "YD999999",
+        success: () => {
+          uni.showToast({ title: "运单号已复制", icon: "success" });
+        },
+      });
+    },
+  },
+};
+</script>
+
+<style>
+@import url("./index.css");
+</style>
\ No newline at end of file
diff --git a/packages/myOrders/orderDetails/index.css b/packages/myOrders/orderDetails/index.css
index 779d9d76..35f66982 100644
--- a/packages/myOrders/orderDetails/index.css
+++ b/packages/myOrders/orderDetails/index.css
@@ -25,6 +25,14 @@ page {
 .tips {
     font-size: 24rpx;
     opacity: 0.9;
+    display: flex;
+    align-items: center;
+}
+
+.phone {
+    width: 30rpx;
+    height: 30rpx;
+    margin-left: 5rpx;
 }
 
 /* 订单金额 */
@@ -67,11 +75,27 @@ page {
 }
 
 .goods-item {
+    /* display: flex;
+    margin-bottom: 20rpx;
+    margin-top: 20rpx; */
+}
+
+.goods-content {
     display: flex;
     margin-bottom: 20rpx;
     margin-top: 20rpx;
 }
 
+.goods-info-tk{
+    width: 150rpx;
+    height: 35rpx;
+    position: relative;
+    left: 550rpx;
+    font-size: 26rpx;
+    font-weight: bold;
+    color: #fe380c;
+}
+
 .goods-img {
     width: 120rpx;
     height: 120rpx;
@@ -159,7 +183,7 @@ page {
     font-size: 26rpx;
 }
 
-.info-value text{
+.info-value text {
     color: #f64927;
     font-size: 26rpx;
     margin-left: 10rpx;
@@ -188,7 +212,17 @@ page {
     height: 80rpx;
     background: #d9d9d9;
     color: #333;
-    border: 1rpx solid #ddd;
+    border-radius: 8rpx;
+    margin-right: 20rpx;
+    font-size: 30rpx;
+    border-radius: 50rpx;
+}
+
+.yfd-btn {
+    flex: 1;
+    height: 80rpx;
+    background: #ffebcb;
+    color: #802002;
     border-radius: 8rpx;
     margin-right: 20rpx;
     font-size: 30rpx;
diff --git a/packages/myOrders/orderDetails/index.vue b/packages/myOrders/orderDetails/index.vue
index 2830680f..972d253c 100644
--- a/packages/myOrders/orderDetails/index.vue
+++ b/packages/myOrders/orderDetails/index.vue
@@ -1,36 +1,69 @@
 <template>
   <view class="container">
     <!-- 顶部状态栏 -->
-    <view class="status-bar">
+    <view class="status-bar" v-if="status === '待付款'">
       <view class="status">待付款</view>
       <view class="countdown">剩余支付时间: {{ countdown }}</view>
       <view class="tips">10分钟内未支付订单自动取消</view>
     </view>
+    <view class="status-bar" v-if="status === '待发货'">
+      <view class="status">待发货</view>
+      <view class="countdown">预计到货时间: 2025-09-09 9:59:59</view>
+      <view class="tips">商家正在加急打包中了，请耐心等候</view>
+    </view>
+    <view class="status-bar" v-if="status === '配送中'">
+      <view class="status">待配送</view>
+      <view class="countdown">预计到货时间: 2025-09-09 9:59:59</view>
+      <view class="tips">
+        配送司机：15901518415
+        <img class="phone" src="http://localhost:8080/phone.png" />
+      </view>
+    </view>
+    <view class="status-bar" v-if="status === '已完成' || status === '退款中'">
+      <view class="status">已完成</view>
+      <view class="countdown">预计到货时间: 2025-09-09 9:59:59</view>
+      <view class="tips">感谢对我们的信任，期待下次光临</view>
+    </view>
+    <view class="status-bar" v-if="status === '已取消'">
+      <view class="status">已取消</view>
+      <view class="countdown">订单已取消</view>
+      <view class="tips">您的订单已取消，再来一单吧</view>
+    </view>
+    <!-- <view class="status-bar" v-if="status === '退款中'">
+      <view class="status">已完成</view>
+      <view class="countdown">预计到货时间: 2025-09-09 9:59:59</view>
+      <view class="tips">感谢对我们的信任，期待下次光临</view>
+    </view> -->
 
     <view class="content">
       <!-- 订单金额 -->
       <view class="amount-section">
-        <view class="total-amount">¥{{ orderInfo.totalAmount }}</view>
-        <view class="original-price"
-          >商品下单应付
-          <text> ¥{{ orderInfo.originalPrice }}</text>
+        <view v-if="status !== '退款中'">
+          <view class="total-amount">¥{{ orderInfo.totalAmount }}</view>
+          <view class="original-price"
+            >商品下单应付
+            <text> ¥{{ orderInfo.originalPrice }}</text>
+          </view>
         </view>
         <view
           class="goods-item"
           v-for="(item, index) in orderInfo.goodsList"
           :key="index"
         >
-          <image :src="item.image" class="goods-img"></image>
-          <view class="goods-info">
-            <view>
-              <view class="goods-name">{{ item.name }}</view>
-              <view class="goods-desc">{{ item.desc }}</view>
-            </view>
-            <view>
-              <view class="goods-price">¥{{ item.price }}</view>
-              <view class="goods-info-right"> x{{ item.quantity }}</view>
+          <view class="goods-content">
+            <image :src="item.image" class="goods-img"></image>
+            <view class="goods-info">
+              <view>
+                <view class="goods-name">{{ item.name }}</view>
+                <view class="goods-desc">{{ item.desc }}</view>
+              </view>
+              <view>
+                <view class="goods-price">¥{{ item.price }}</view>
+                <view class="goods-info-right"> x{{ item.quantity }}</view>
+              </view>
             </view>
           </view>
+          <view v-if="status === '退款中'" class="goods-info-tk">退款已完成</view>
         </view>
         <view class="hr"></view>
         <view class="info-item">
@@ -49,69 +82,95 @@
         </view>
       </view>
 
-      <!-- 配送信息 -->
-      <view class="delivery-info">
-        <view class="section-title">配送信息</view>
-        <view class="info-item">
-          <view class="info-label">配送方式</view>
-          <view class="info-value">{{ orderInfo.deliveryType }}</view>
-        </view>
-        <view class="info-item">
-          <view class="info-label">预计配送时间</view>
-          <view class="info-value">{{ orderInfo.deliveryTime }}</view>
-        </view>
-      </view>
-
-      <!-- 收货信息 -->
-      <view class="recipient-info">
-        <view class="section-title">收货信息</view>
-        <view class="info-item">
-          <view class="info-label">收货人</view>
-          <view class="info-value"
-            >{{ orderInfo.recipientName }}
-            <text> {{ orderInfo.recipientPhone }}</text>
+      <view v-if="status !== '退款中'">
+        <!-- 配送信息 -->
+        <view class="delivery-info">
+          <view class="section-title">配送信息</view>
+          <view class="info-item">
+            <view class="info-label">配送方式</view>
+            <view class="info-value">{{ orderInfo.deliveryType }}</view>
+          </view>
+          <view class="info-item">
+            <view class="info-label">预计配送时间</view>
+            <view class="info-value">{{ orderInfo.deliveryTime }}</view>
           </view>
         </view>
-        <view class="info-item">
-          <view class="info-label">收货地址</view>
-          <view class="info-value">{{ orderInfo.recipientAddress }}</view>
-        </view>
-      </view>
 
-      <!-- 订单信息详情 -->
-      <view class="order-detail-info">
-        <view class="section-title">订单信息</view>
-        <view class="info-item">
-          <view class="info-label">订单编号</view>
-          <view class="info-value">{{ orderInfo.orderNumber }}</view>
+        <!-- 收货信息 -->
+        <view class="recipient-info">
+          <view class="section-title">收货信息</view>
+          <view class="info-item">
+            <view class="info-label">收货人</view>
+            <view class="info-value"
+              >{{ orderInfo.recipientName }}
+              <text> {{ orderInfo.recipientPhone }}</text>
+            </view>
+          </view>
+          <view class="info-item">
+            <view class="info-label">收货地址</view>
+            <view class="info-value">{{ orderInfo.recipientAddress }}</view>
+          </view>
         </view>
-        <view class="info-item">
-          <view class="info-label">支付方式</view>
-          <view class="info-value">{{ orderInfo.paymentMethod }}</view>
-        </view>
-        <view class="info-item">
-          <view class="info-label">下单时间</view>
-          <view class="info-value">{{ orderInfo.orderTime }}</view>
-        </view>
-        <view class="info-item">
-          <view class="info-label">备注</view>
-          <view class="info-value">{{ orderInfo.remark }}</view>
-        </view>
-      </view>
 
-      <!-- 底部操作按钮 -->
-      <view class="bottom-buttons">
-        <button class="cancel-btn" @click="cancelOrder">取消订单</button>
-        <button class="pay-btn" @click="gotoPayment">立即支付</button>
+        <!-- 订单信息详情 -->
+        <view class="order-detail-info">
+          <view class="section-title">订单信息</view>
+          <view class="info-item">
+            <view class="info-label">订单编号</view>
+            <view class="info-value">{{ orderInfo.orderNumber }}</view>
+          </view>
+          <view class="info-item">
+            <view class="info-label">支付方式</view>
+            <view class="info-value">{{ orderInfo.paymentMethod }}</view>
+          </view>
+          <view class="info-item">
+            <view class="info-label">下单时间</view>
+            <view class="info-value">{{ orderInfo.orderTime }}</view>
+          </view>
+          <view class="info-item">
+            <view class="info-label">备注</view>
+            <view class="info-value">{{ orderInfo.remark }}</view>
+          </view>
+        </view>
+
+        <!-- 底部操作按钮 -->
+        <view class="bottom-buttons" v-if="status === '待付款'">
+          <button class="cancel-btn" @click="cancelOrder">取消订单</button>
+          <button class="yfd-btn" @click="cancelOrder">运费单</button>
+          <button class="pay-btn" @click="gotoPayment">立即支付</button>
+        </view>
+        <view class="bottom-buttons" v-if="status === '待发货'">
+          <button class="yfd-btn" @click="cancelOrder">运费单</button>
+          <button class="cancel-btn" @click="cancelOrder">取消订单</button>
+          <!-- <button class="pay-btn" @click="gotoPayment">立即支付</button> -->
+        </view>
+        <view class="bottom-buttons" v-if="status === '配送中'">
+          <button class="cancel-btn" @click="checkLogistics">查看物流</button>
+          <button class="yfd-btn" @click="cancelOrder">运费单</button>
+          <button class="pay-btn" @click="gotoPayment">立即支付</button>
+        </view>
+        <view class="bottom-buttons" v-if="status === '已完成'">
+          <button class="cancel-btn" @click="cancelOrder">服务评价</button>
+          <button class="yfd-btn" @click="cancelOrder">运费单</button>
+          <button class="pay-btn" @click="gotoPayment">立即支付</button>
+        </view>
+        <view class="bottom-buttons" v-if="status === '已取消'">
+          <button class="yfd-btn" @click="cancelOrder">运费单</button>
+          <!-- <button class="cancel-btn" @click="cancelOrder">服务评价</button> -->
+          <button class="pay-btn" @click="gotoPayment">再来一单</button>
+        </view>
       </view>
     </view>
   </view>
 </template>
 
 <script>
+import { picUrl, NavgateTo } from "../../../utils";
+
 export default {
   data() {
     return {
+      status: "",
       countdown: "9:59:59",
       orderInfo: {
         totalAmount: "4704.00",
@@ -155,9 +214,10 @@ export default {
       },
     };
   },
-  onLoad() {
+  onLoad(options) {
     // 启动倒计时
-    this.startCountdown();
+    options?.status === "待付款" ? this.startCountdown() : "";
+    this.status = options?.status;
   },
   methods: {
     startCountdown() {
@@ -194,10 +254,14 @@ export default {
       });
     },
     gotoPayment() {
+      console.log("🚀 ~ gotoPayment ~ 去支付:");
       // 跳转到支付页面
-      uni.navigateTo({
-        url: "/kitchen/pay/index",
-      });
+      // uni.navigateTo({
+      //   url: "/kitchen/pay/index",
+      // });
+    },
+    checkLogistics() {
+      NavgateTo(`/packages/myOrders/logistics/index`);
     },
   },
 };
diff --git a/pages.json b/pages.json
index 0e909ecf..6f8ff747 100644
--- a/pages.json
+++ b/pages.json
@@ -755,6 +755,12 @@
 					"style": {
 						"navigationBarTitleText": "我的订单"
 					}
+				},
+				{
+					"path": "logistics/index",
+					"style": {
+						"navigationBarTitleText": "物流跟踪"
+					}
 				}
 			]
 		}

From 1ae26edd9893faa44d44d9a1d83762917accf107 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AF=85?= <1335909236@qq.com>
Date: Thu, 17 Jul 2025 14:46:18 +0800
Subject: [PATCH 3/7] =?UTF-8?q?feat=20:=20=E8=AE=A2=E5=8D=95=E8=AF=84?=
 =?UTF-8?q?=E4=BB=B7=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/myOrders/index/index.vue          |   6 +-
 packages/myOrders/logistics/index.vue      |   4 +-
 packages/myOrders/orderDetails/index.vue   |   6 +-
 packages/myOrders/orderEvaluate/index.css  | 202 +++++++++++++++++++++
 packages/myOrders/orderEvaluate/index.vue  | 179 ++++++++++++++++++
 packages/myOrders/selfPickUpSite/index.css |   0
 packages/myOrders/selfPickUpSite/index.vue |   0
 packages/myOrders/submitOrder/index.css    |   0
 packages/myOrders/submitOrder/index.vue    |   0
 pages.json                                 |  18 ++
 10 files changed, 411 insertions(+), 4 deletions(-)
 create mode 100644 packages/myOrders/orderEvaluate/index.css
 create mode 100644 packages/myOrders/orderEvaluate/index.vue
 create mode 100644 packages/myOrders/selfPickUpSite/index.css
 create mode 100644 packages/myOrders/selfPickUpSite/index.vue
 create mode 100644 packages/myOrders/submitOrder/index.css
 create mode 100644 packages/myOrders/submitOrder/index.vue

diff --git a/packages/myOrders/index/index.vue b/packages/myOrders/index/index.vue
index abb3b64c..14250f12 100644
--- a/packages/myOrders/index/index.vue
+++ b/packages/myOrders/index/index.vue
@@ -77,7 +77,7 @@
                     </button>
                   </view>
                   <view class="btn-group" v-if="item.status === '已完成'">
-                    <button class="cancel-btn" @click="cancelOrder">
+                    <button class="cancel-btn" @click="orderEvaluate">
                       服务评价
                     </button>
                     <button class="yfd-btn" @click="cancelOrder">运费单</button>
@@ -221,6 +221,10 @@ export default {
     checkLogistics() {
       NavgateTo(`/packages/myOrders/logistics/index`);
     },
+
+    orderEvaluate(){
+      NavgateTo(`/packages/myOrders/orderEvaluate/index`);
+    }
   },
 };
 </script>
diff --git a/packages/myOrders/logistics/index.vue b/packages/myOrders/logistics/index.vue
index 10cec369..d5929f43 100644
--- a/packages/myOrders/logistics/index.vue
+++ b/packages/myOrders/logistics/index.vue
@@ -146,8 +146,8 @@ export default {
 
       // 地图显示区域
       points: [
-        { latitude: 39.915, longitude: 116.42 },
-        { latitude: 39.90469, longitude: 116.40717 },
+        { latitude: 39.876, longitude: 116.435 },
+        { latitude: 39.886, longitude: 116.395 },
       ],
     };
   },
diff --git a/packages/myOrders/orderDetails/index.vue b/packages/myOrders/orderDetails/index.vue
index 972d253c..cdb3bf3f 100644
--- a/packages/myOrders/orderDetails/index.vue
+++ b/packages/myOrders/orderDetails/index.vue
@@ -150,7 +150,7 @@
           <button class="pay-btn" @click="gotoPayment">立即支付</button>
         </view>
         <view class="bottom-buttons" v-if="status === '已完成'">
-          <button class="cancel-btn" @click="cancelOrder">服务评价</button>
+          <button class="cancel-btn" @click="orderEvaluate">服务评价</button>
           <button class="yfd-btn" @click="cancelOrder">运费单</button>
           <button class="pay-btn" @click="gotoPayment">立即支付</button>
         </view>
@@ -263,6 +263,10 @@ export default {
     checkLogistics() {
       NavgateTo(`/packages/myOrders/logistics/index`);
     },
+
+    orderEvaluate(){
+      NavgateTo(`/packages/myOrders/orderEvaluate/index`);
+    }
   },
 };
 </script>
diff --git a/packages/myOrders/orderEvaluate/index.css b/packages/myOrders/orderEvaluate/index.css
new file mode 100644
index 00000000..b897d90a
--- /dev/null
+++ b/packages/myOrders/orderEvaluate/index.css
@@ -0,0 +1,202 @@
+page {
+    background-color: #f0f2f5;
+    min-height: 100vh;
+    overflow-y: hidden;
+}
+
+.container {
+    padding: 20rpx;
+}
+
+/* 商品图片区域 */
+.goods-scroll {
+    width: 96%;
+    white-space: nowrap;
+    margin-bottom: 30rpx;
+    padding: 20rpx 15rpx;
+    background-color: #ffffff;
+}
+
+.goods-list {
+    display: inline-flex;
+}
+
+.goods-item {
+    width: 120rpx;
+    height: 120rpx;
+    margin-right: 16rpx;
+    border-radius: 8rpx;
+    overflow: hidden;
+}
+
+.goods-img {
+    width: 100%;
+    height: 100%;
+    object-fit: cover;
+}
+
+/* 订单编号 */
+.order-info {
+    display: flex;
+    justify-content: space-between;
+    padding: 20rpx 0;
+    border-bottom: 1rpx solid #EEEEEE;
+    margin-bottom: 30rpx;
+}
+
+.order-label {
+    font-size: 26rpx;
+    color: #9a9a9a;
+}
+
+.order-value {
+    font-size: 26rpx;
+    color: #333333;
+}
+
+/* 评分区域 */
+.rating{
+    width: 460rpx;
+    display: flex;
+    justify-content: space-between;
+    margin: 0 0 20rpx 180rpx;
+    color: #a6a6a6;
+}
+
+.rating-section {
+    background-color: #FFFFFF;
+    border-radius: 16rpx;
+    padding: 20rpx;
+    margin-bottom: 30rpx;
+    height: 80vh;
+}
+
+.rating-item {
+    display: flex;
+    align-items: center;
+    margin-bottom: 30rpx;
+}
+
+.rating-item:last-child {
+    margin-bottom: 0;
+}
+
+.rating-label {
+    width: 160rpx;
+    font-size: 28rpx;
+    color: #333333;
+    font-weight: bold;
+}
+
+/* 评价输入 */
+.comment-section {
+    padding: 20rpx;
+    margin-bottom: 30rpx;
+    border-top: 1rpx solid #f5f5f5;
+}
+
+.comment-input {
+    width: 100%;
+    min-height: 100rpx;
+    font-size: 26rpx;
+    color: #333333;
+    line-height: 1.5;
+}
+
+/* 图片上传 */
+.upload-section {
+    /* background-color: #FFFFFF; */
+    border-radius: 16rpx;
+    padding: 20rpx;
+    margin-bottom: 40rpx;
+    display: flex;
+}
+
+.upload-btn {
+    display: flex;
+    width: 150rpx;
+    height: 150rpx;
+    padding: 15rpx;
+    background-color: #f6f6f6;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    margin-bottom: 20rpx;
+    border-radius: 20rpx;
+}
+
+.upload-icon {
+    width: 60rpx;
+    height: 50rpx;
+    margin-right: 10rpx;
+}
+
+.upload-text {
+    font-size: 28rpx;
+    color: #333333;
+    margin: 10rpx 0;
+}
+
+.upload-count {
+    font-size: 28rpx;
+    color: #999999;
+}
+
+.image-list {
+    display: flex;
+    /* flex-wrap: wrap; */
+}
+
+.image-item {
+    width: 170rpx;
+    height: 170rpx;
+    margin-right: 20rpx;
+    margin-bottom: 20rpx;
+    position: relative;
+    border-radius: 20rpx;
+    overflow: hidden;
+}
+
+.uploaded-img {
+    width: 100%;
+    height: 100%;
+    object-fit: cover;
+}
+
+.delete-btn {
+    position: absolute;
+    top: -10rpx;
+    right: -10rpx;
+    width: 36rpx;
+    height: 36rpx;
+    background-color: rgba(0, 0, 0, 0.5);
+    border-radius: 50%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+
+.delete-icon {
+    color: #FFFFFF;
+    font-size: 24rpx;
+    font-weight: bold;
+}
+
+/* 提交按钮 */
+.submit-btn {
+    width: 90%;
+    height: 98rpx;
+    background-color: #ff4117;
+    border-radius: 49rpx;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin-top: 20rpx;
+    margin: 0 auto;
+}
+
+.btn-text {
+    font-size: 32rpx;
+    color: #FFFFFF;
+    font-weight: bold;
+}
\ No newline at end of file
diff --git a/packages/myOrders/orderEvaluate/index.vue b/packages/myOrders/orderEvaluate/index.vue
new file mode 100644
index 00000000..9471a14c
--- /dev/null
+++ b/packages/myOrders/orderEvaluate/index.vue
@@ -0,0 +1,179 @@
+<template>
+  <view class="container">
+    <!-- 商品图片区域 -->
+    <scroll-view class="goods-scroll" scroll-x>
+      <view class="goods-list">
+        <view class="goods-item" v-for="(item, index) in goods" :key="index">
+          <image :src="item.image" class="goods-img"></image>
+        </view>
+      </view>
+    </scroll-view>
+
+    <!-- 评分区域 -->
+    <view class="rating-section">
+      <!-- 订单编号 -->
+      <view class="order-info">
+        <text class="order-label">订单编号</text>
+        <text class="order-value">38757328485</text>
+      </view>
+      <view class="rating">
+        <view>很差</view>
+        <view>差</view>
+        <view>一般</view>
+        <view>不错</view>
+        <view>满意</view>
+      </view>
+      <!-- 商品品质 -->
+      <view class="rating-item">
+        <text class="rating-label">商品品质</text>
+        <u-rate
+          v-model="qualityRating"
+          size="40"
+          active-color="#FFB400"
+          inactive-color="#EEEEEE"
+          gutter="60"
+        ></u-rate>
+      </view>
+
+      <!-- 配送速度 -->
+      <view class="rating-item">
+        <text class="rating-label">配送速度</text>
+        <u-rate
+          v-model="speedRating"
+          size="40"
+          active-color="#FFB400"
+          inactive-color="#EEEEEE"
+          gutter="60"
+        ></u-rate>
+      </view>
+
+      <!-- 快递员服务 -->
+      <view class="rating-item">
+        <text class="rating-label">快递员服务</text>
+        <u-rate
+          v-model="serviceRating"
+          size="40"
+          active-color="#FFB400"
+          inactive-color="#EEEEEE"
+          gutter="60"
+        ></u-rate>
+      </view>
+
+      <!-- 评价输入 -->
+      <view class="comment-section">
+        <textarea
+          class="comment-input"
+          placeholder="亲，可以从其他角度评价商品，可以帮助我们为您提供更好的服务~"
+          v-model="comment"
+        ></textarea>
+      </view>
+      <!-- 图片上传 -->
+      <view class="upload-section">
+        <view class="image-list">
+          <view
+            class="image-item"
+            v-for="(img, index) in imageList"
+            :key="index"
+          >
+            <image :src="img" class="uploaded-img"></image>
+            <view class="delete-btn" @click="deleteImage(index)">
+              <text class="delete-icon">×</text>
+            </view>
+          </view>
+        </view>
+        <view
+          class="upload-btn"
+          @click="chooseImage"
+          v-if="imageList.length < 3"
+        >
+          <image
+            src="http://localhost:8080/upload.png"
+            class="upload-icon"
+          ></image>
+          <view class="upload-text">上传图片</view>
+          <view class="upload-count">({{ imageList.length }}/3)</view>
+        </view>
+      </view>
+      <!-- 提交按钮 -->
+      <view class="submit-btn" @click="submitEvaluate">
+        <text class="btn-text">提交</text>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      // 商品列表
+      goods: [
+        { image: "http://localhost:8080/order_index1.png" },
+        { image: "http://localhost:8080/order_index2.png" },
+        { image: "http://localhost:8080/order_index3.png" },
+        { image: "http://localhost:8080/order_index4.png" },
+        { image: "http://localhost:8080/order_index5.png" },
+        { image: "http://localhost:8080/order_index1.png" },
+        { image: "http://localhost:8080/order_index2.png" },
+        { image: "http://localhost:8080/order_index3.png" },
+        { image: "http://localhost:8080/order_index4.png" },
+        { image: "http://localhost:8080/order_index5.png" },
+      ],
+      // 评分数据
+      qualityRating: 5,
+      speedRating: 0,
+      serviceRating: 0,
+      // 评价内容
+      comment: "",
+      // 图片列表
+      imageList: [],
+    };
+  },
+  methods: {
+    // 选择图片
+    chooseImage() {
+      if (this.imageList.length >= 3) {
+        uni.showToast({
+          title: "最多上传3张图片",
+          icon: "none",
+        });
+        return;
+      }
+      uni.chooseImage({
+        count: 3 - this.imageList.length,
+        sizeType: ["original", "compressed"],
+        sourceType: ["album", "camera"],
+        success: (res) => {
+          this.imageList = this.imageList.concat(res.tempFilePaths);
+        },
+      });
+    },
+    // 删除图片
+    deleteImage(index) {
+      this.imageList.splice(index, 1);
+    },
+    // 提交评价
+    submitEvaluate() {
+      if (!this.comment.trim() && this.imageList.length === 0) {
+        uni.showToast({
+          title: "请至少填写评价内容或上传图片",
+          icon: "none",
+        });
+        return;
+      }
+      // 这里添加提交评价的API调用逻辑
+      uni.showToast({
+        title: "评价提交成功",
+        icon: "success",
+      });
+      setTimeout(() => {
+        uni.navigateBack();
+      }, 1500);
+    },
+  },
+};
+</script>
+
+<style>
+@import url("./index.css");
+</style>
\ No newline at end of file
diff --git a/packages/myOrders/selfPickUpSite/index.css b/packages/myOrders/selfPickUpSite/index.css
new file mode 100644
index 00000000..e69de29b
diff --git a/packages/myOrders/selfPickUpSite/index.vue b/packages/myOrders/selfPickUpSite/index.vue
new file mode 100644
index 00000000..e69de29b
diff --git a/packages/myOrders/submitOrder/index.css b/packages/myOrders/submitOrder/index.css
new file mode 100644
index 00000000..e69de29b
diff --git a/packages/myOrders/submitOrder/index.vue b/packages/myOrders/submitOrder/index.vue
new file mode 100644
index 00000000..e69de29b
diff --git a/pages.json b/pages.json
index 6f8ff747..349b98ec 100644
--- a/pages.json
+++ b/pages.json
@@ -761,6 +761,24 @@
 					"style": {
 						"navigationBarTitleText": "物流跟踪"
 					}
+				},
+				{
+					"path": "orderEvaluate/index",
+					"style": {
+						"navigationBarTitleText": "评价"
+					}
+				},
+				{
+					"path": "submitOrder/index",
+					"style": {
+						"navigationBarTitleText": "提交订单"
+					}
+				},
+				{
+					"path": "selfPickUpSite/index",
+					"style": {
+						"navigationBarTitleText": "选择自提点"
+					}
 				}
 			]
 		}

From fdd5bbfb3b32e80a0af09ef1622542534ce78c1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AF=85?= <1335909236@qq.com>
Date: Thu, 17 Jul 2025 18:25:20 +0800
Subject: [PATCH 4/7] =?UTF-8?q?feat=20:=20=E5=AF=B9=E6=8E=A5=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E9=A6=96=E9=A1=B5=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/shop.js                   |   2 +-
 packages/shop/index/index.vue | 792 ++++++++++++++++++++--------------
 2 files changed, 463 insertions(+), 331 deletions(-)

diff --git a/api/shop.js b/api/shop.js
index 192cd1ce..3b0214b3 100644
--- a/api/shop.js
+++ b/api/shop.js
@@ -6,5 +6,5 @@ export const apiArr = {
   getCarCount:"/api/v2/wechat/commodity/cart/all_count",//购物车数量
   addCar:"/api/v2/wechat/commodity/cart/add",//添加购物车
   deleteCar:"/api/v2/wechat/commodity/cart/delete",//删除购物车
-  updateCar:"/api/v2/wechat/commodity/cart/update",
+  updateCar:"/api/v2/wechat/commodity/cart/update",//更新购物车
 }
\ No newline at end of file
diff --git a/packages/shop/index/index.vue b/packages/shop/index/index.vue
index 3733ceba..4bcdc7e3 100644
--- a/packages/shop/index/index.vue
+++ b/packages/shop/index/index.vue
@@ -1,368 +1,500 @@
 <template>
-	<div class="container">
-		<!-- 顶部展开后的阴影 -->
-		<div class="boxshadow" v-if="topShow"></div>
-		<div class="header" :class="topShow ? 'op0' : ''">
-			<div class="searchBox" :style="{ height: localHeight + 'px', paddingTop: top + 'px' }">
-				<div class="searchBox_left">
-					<!-- <u-icon name="arrow-left" size="20px" color="#000"></u-icon> -->
-				</div>
-				<div class="searchBox_ipt" @click="searchPage">
-					<image
-						src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/com_communitySearchIcon.png"
-						mode="aspectFill"></image>
-					<input disabled type="text" placeholder="输入商品名称">
-				</div>
-			</div>
-			<div class="slide">
-				<div class="slide_con">
-					<div v-for="(item, index) in CateList" :key="index" class="slide_conBox">
-						<view class="slide_item">
-							<image :src="picUrl + item.category_pic" mode="aspectFill"></image>
-							<text>{{ item.category_name }}</text>
-						</view>
-					</div>
-				</div>
+  <div class="container">
+    <!-- 顶部展开后的阴影 -->
+    <div class="boxshadow" v-if="topShow"></div>
+    <div class="header" :class="topShow ? 'op0' : ''">
+      <div
+        class="searchBox"
+        :style="{ height: localHeight + 'px', paddingTop: top + 'px' }"
+      >
+        <div class="searchBox_left">
+          <!-- <u-icon name="arrow-left" size="20px" color="#000"></u-icon> -->
+        </div>
+        <div class="searchBox_ipt" @click="searchPage">
+          <image
+            src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/com_communitySearchIcon.png"
+            mode="aspectFill"
+          ></image>
+          <input disabled type="text" placeholder="输入商品名称" />
+        </div>
+      </div>
+      <div class="slide">
+        <div class="slide_con">
+          <div
+            v-for="(item, index) in CateList"
+            :key="index"
+            class="slide_conBox"
+            @click="changeCate(item.id)"
+          >
+            <view class="slide_item">
+              <image
+                :src="picUrl + item.category_pic"
+                mode="aspectFill"
+              ></image>
+              <text>{{ item.category_name }}</text>
+            </view>
+          </div>
+        </div>
 
-				<div class="open" @click="topOpen" v-if="!topShow">
-					展 开
-					<image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/shop_openIcon.png"
-						mode="aspectFill"></image>
-				</div>
-			</div>
+        <div class="open" @click="topOpen" v-if="!topShow">
+          展 开
+          <image
+            src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/shop_openIcon.png"
+            mode="aspectFill"
+          ></image>
+        </div>
+      </div>
+    </div>
 
-		</div>
+    <!-- 整体展开的顶部 -->
+    <div class="header header2" v-if="topShow">
+      <div
+        class="searchBox"
+        :style="{ height: localHeight + 'px', paddingTop: top + 'px' }"
+      >
+        <div class="searchBox_left">
+          <u-icon name="arrow-left" size="20px" color="#000"></u-icon>
+        </div>
+        <div class="searchBox_ipt">
+          <image
+            src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/com_communitySearchIcon.png"
+            mode="aspectFill"
+          ></image>
+          <input type="text" placeholder="输入商品名称" />
+        </div>
+      </div>
 
-		<!-- 整体展开的顶部 -->
-		<div class="header header2" v-if="topShow">
-			<div class="searchBox" :style="{ height: localHeight + 'px', paddingTop: top + 'px' }">
-				<div class="searchBox_left">
-					<u-icon name="arrow-left" size="20px" color="#000"></u-icon>
-				</div>
-				<div class="searchBox_ipt">
-					<image
-						src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/com_communitySearchIcon.png"
-						mode="aspectFill"></image>
-					<input type="text" placeholder="输入商品名称">
-				</div>
-			</div>
+      <div class="slide">
+        <div class="slide_con">
+          <div
+            v-for="(item, index) in CateList"
+            :key="index"
+            class="slide_conBox"
+          >
+            <view class="slide_item">
+              <image
+                :src="picUrl + item.category_pic"
+                mode="aspectFill"
+              ></image>
+              <text>{{ item.category_name }}</text>
+            </view>
+          </div>
+        </div>
+      </div>
 
-			<div class="slide">
-				<div class="slide_con">
-					<div v-for="(item, index) in CateList" :key="index" class="slide_conBox">
-						<view class="slide_item">
-							<image :src="picUrl + item.category_pic" mode="aspectFill"></image>
-							<text>{{ item.category_name }}</text>
-						</view>
-					</div>
-				</div>
-			</div>
+      <div class="hides" @click="topOpen">
+        收起 <u-icon name="arrow-up"></u-icon>
+      </div>
+    </div>
 
-			<div class="hides" @click="topOpen">
-				收起 <u-icon name="arrow-up"></u-icon>
-			</div>
-		</div>
-
-
-		<div class="Con">
-			<div class="Con_left">
-				<div class="CateItem" v-for="item in leftCateList" :key="item.id" @click="changeLeftCate(item.id)">
-					<!-- <image v-if="false" class="hot"
+    <div class="Con">
+      <div class="Con_left">
+        <div
+          class="CateItem"
+          v-for="item in leftCateList"
+          :key="item.id"
+          @click="changeLeftCate(item.id)"
+        >
+          <!-- <image v-if="false" class="hot"
 						src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/shop_hot.png"
 						mode="aspectFill">
 					</image> -->
-					<!-- <image class="bao"
+          <!-- <image class="bao"
 						src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/shop_bao.png"
 						mode="aspectFill"></image> -->
-					{{ item.category_name }}
-				</div>
-			</div>
-			<div class="Con_right">
-				<div class="CateList_Box" :class="cateListShow ? 'bgf' : ''">
-					<div class="CateList" ref="cateListRef">
-						<div class="CateList_Item" v-for="(item, index) in tagList" :key="item.id"
-							:class="index == rightTopActive ? 'CateList_Item_active' : ''" @click="checkItem(index)">{{ item.tag_name }}
-						</div>
+          {{ item.category_name }}
+        </div>
+      </div>
+      <div class="Con_right">
+        <div class="CateList_Box" :class="cateListShow ? 'bgf' : ''">
+          <div class="CateList" ref="cateListRef">
+            <div
+              class="CateList_Item"
+              v-for="(item, index) in tagList"
+              :key="item.id"
+              :class="index == rightTopActive ? 'CateList_Item_active' : ''"
+              @click="checkItem(index)"
+            >
+              {{ item.tag_name }}
+            </div>
+          </div>
+          <div class="more" @click="changeCateListShow">
+            <u-icon v-if="!cateListShow" name="arrow-down"></u-icon>
+            <u-icon v-if="cateListShow" name="arrow-up"></u-icon>
+          </div>
+        </div>
+        <!-- 右下展开的内容 -->
+        <div class="activeCateList" v-if="cateListShow">
+          <div
+            class="CateList_Item"
+            v-for="(item, index) in tagList"
+            :key="index"
+            :class="index == rightTopActive ? 'CateList_Item_active' : ''"
+            @click="checkItem(index)"
+          >
+            {{ item.tag_name }}
+          </div>
+        </div>
+        <!-- 右下阴影 -->
+        <div class="boxshadow2" v-if="cateListShow"></div>
 
-					</div>
-					<div class="more" @click="changeCateListShow">
-						<u-icon v-if="!cateListShow" name="arrow-down"></u-icon>
-						<u-icon v-if="cateListShow" name="arrow-up"></u-icon>
-					</div>
-				</div>
-				<!-- 右下展开的内容 -->
-				<div class="activeCateList" v-if="cateListShow">
-					<div class="CateList_Item" v-for="(item, index) in tagList" :key="index"
-						:class="index == rightTopActive ? 'CateList_Item_active' : ''" @click="checkItem(index)">{{ item.tag_name }}
-					</div>
-				</div>
-				<!-- 右下阴影 -->
-				<div class="boxshadow2" v-if="cateListShow"></div>
+        <div class="CateInfo" v-for="(item, index) in tagList" :key="item.id">
+          <div class="CateInfo_tit">
+            {{ item.tag_name }}
+          </div>
+          <div
+            class="CateInfo_Item"
+            v-for="items in item.commodity_info_list"
+            :key="items.id"
+          >
+            <div class="CateInfo_Item_Box">
+              <div class="CateInfo_Item_left" @click="goods(items.id)">
+                <image
+                  :src="picUrl + items.commodity_pic"
+                  mode="aspectFill"
+                ></image>
+              </div>
+              <div class="CateInfo_Item_right" :class="GGshow ? 'noneBor' : ''">
+                <div class="CateInfo_Item_right_Tit" @click="goods(items.id)">
+                  {{ items.commodity_name }}
+                </div>
+                <div
+                  class="CateInfo_Item_right_subtit"
+                  @click="goods(items.id)"
+                >
+                  {{ items.commodity_intro }}
+                </div>
+                <div class="CateInfo_Item_Money">
+                  <div class="CateInfo_Item_Money_left">
+                    <span>￥</span
+                    >{{ items.commodity_goods_info_list[0].sales_price }}
+                  </div>
+                  <div
+                    class="CateInfo_Item_Money_right"
+                    v-if="!(items.commodity_goods_info_list.length > 1)"
+                  >
+                    <u-number-box
+                      :min="0"
+                      v-model="items.quantity"
+                      @change="handleQuantityChange(items)"
+                    >
+                      <view slot="minus" class="minus">
+                        <u-icon name="minus" size="20"></u-icon>
+                      </view>
+                      <text
+                        slot="input"
+                        style="width: 50px; text-align: center"
+                        class="input"
+                        >{{ items.quantity ? items.quantity : 0 }}</text
+                      >
+                      <view slot="plus" class="plus">
+                        <u-icon name="plus" color="#FFFFFF" size="20"></u-icon>
+                      </view>
+                    </u-number-box>
+                  </div>
+                </div>
 
-				<div class="CateInfo" v-for="(item, index) in tagList" :key="item.id">
-					<div class="CateInfo_tit">
-						{{ item.tag_name }}
-					</div>
-					<div class="CateInfo_Item" v-for="items in item.commodity_info_list" :key="items.id">
-						<div class="CateInfo_Item_Box">
-							<div class="CateInfo_Item_left" @click="goods(items.id)">
-								<image
-									:src="picUrl + items.commodity_pic"
-									mode="aspectFill"></image>
-							</div>
-							<div class="CateInfo_Item_right" :class="GGshow ? 'noneBor' : ''">
-								<div class="CateInfo_Item_right_Tit" @click="goods(items.id)">{{items.commodity_name}}</div>
-								<div class="CateInfo_Item_right_subtit" @click="goods(items.id)">{{items.commodity_intro}}</div>
-								<div class="CateInfo_Item_Money">
-									<div class="CateInfo_Item_Money_left">
-										<span>￥</span>{{ items.commodity_goods_info_list[0].sales_price }}
-									</div>
-									<div class="CateInfo_Item_Money_right">
-										<u-number-box v-model="value">
-											<view slot="minus" class="minus">
-												<u-icon name="minus" size="20"></u-icon>
-											</view>
-											<text slot="input" style="width: 50px;text-align: center;" class="input">{{
-												value }}</text>
-											<view slot="plus" class="plus">
-												<u-icon name="plus" color="#FFFFFF" size="20"></u-icon>
-											</view>
-										</u-number-box>
-									</div>
-								</div>
+                <div
+                  class="gg"
+                  @click="chooseGG(items)"
+                  v-if="
+                    items.commodity_goods_info_list.length > 1 && !items.isShow
+                  "
+                >
+                  选择规格
+                  <u-icon
+                    name="arrow-down"
+                    size="26rpx"
+                    color="#FF370B"
+                  ></u-icon>
+                </div>
 
-								<div class="gg" @click="chooseGG(items)" v-if="items.commodity_goods_info_list.length > 1 && !items.isShow">
-									选择规格 <u-icon name="arrow-down" size="26rpx" color="#FF370B"></u-icon>
-								</div>
+                <div
+                  class="gg"
+                  @click="chooseGG(items)"
+                  v-if="
+                    items.commodity_goods_info_list.length > 1 && items.isShow
+                  "
+                >
+                  收起
+                  <u-icon name="arrow-up" size="26rpx" color="#FF370B"></u-icon>
+                </div>
+              </div>
+            </div>
 
-								<div class="gg" @click="chooseGG(items)" v-if="items.commodity_goods_info_list.length > 1 && items.isShow">
-									收起 <u-icon name="arrow-up" size="26rpx" color="#FF370B"></u-icon>
-								</div>
+            <div class="GGList" v-if="items.isShow">
+              <div
+                class="GGItem"
+                v-for="ite in items.commodity_goods_info_list"
+                @click="goods(items.id)"
+              >
+                <div class="GGItem_Image">
+                  <image
+                    :src="picUrl + ite.commodity_pic"
+                    mode="aspectFill"
+                  ></image>
+                </div>
+                <div class="GGItem_Con">
+                  <div class="GGItem_Con_Tit">{{ ite.goods_name }}</div>
+                  <div class="GGItem_Con_Msg">
+                    <div class="GGItem_Con_Msg_left">
+                      <span>￥</span>{{ ite.sales_price }}
+                    </div>
+                    <div class="GGItem_Con_Msg_right">
+                      <u-number-box
+                        v-model="ite.quantity"
+                        :min="0"
+                        @change="handleQuantityChange(ite)"
+                      >
+                        <view slot="minus" class="minus">
+                          <u-icon name="minus" size="20"></u-icon>
+                        </view>
+                        <text
+                          slot="input"
+                          style="width: 50px; text-align: center"
+                          class="input"
+                          >{{ ite.quantity ? ite.quantity : 0 }}</text
+                        >
+                        <view slot="plus" class="plus">
+                          <u-icon
+                            name="plus"
+                            color="#FFFFFF"
+                            size="20"
+                          ></u-icon>
+                        </view>
+                      </u-number-box>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
 
-							</div>
-						</div>
-
-						<div class="GGList" v-if="items.isShow">
-							<div class="GGItem" v-for="ite in items.commodity_goods_info_list" @click="goods(items.id)">
-								<div class="GGItem_Image">
-									<image
-										:src="picUrl + ite.commodity_pic"
-										mode="aspectFill"></image>
-								</div>
-								<div class="GGItem_Con">
-									<div class="GGItem_Con_Tit">{{ite.goods_name}}</div>
-									<div class="GGItem_Con_Msg">
-										<div class="GGItem_Con_Msg_left">
-											<span>￥</span>{{ ite.sales_price }}
-										</div>
-										<div class="GGItem_Con_Msg_right">
-											<u-number-box v-model="value">
-												<view slot="minus" class="minus">
-													<u-icon name="minus" size="20"></u-icon>
-												</view>
-												<text slot="input" style="width: 50px;text-align: center;"
-													class="input">{{
-														value }}</text>
-												<view slot="plus" class="plus">
-													<u-icon name="plus" color="#FFFFFF" size="20"></u-icon>
-												</view>
-											</u-number-box>
-										</div>
-									</div>
-								</div>
-							</div>
-						</div>
-					</div>
-
-
-					<!-- 按钮 -->
-					<!-- <div class="btn">
+          <!-- 按钮 -->
+          <!-- <div class="btn">
 						查看全部商品
 						<div class="cir">
 							<u-icon name="arrow-right" color="#fff" size="12px"></u-icon>
 						</div>
 					</div> -->
-				</div>
+        </div>
+      </div>
+    </div>
 
+    <nav-footer :current="2" />
 
-			</div>
-		</div>
-
-		<nav-footer :current="2" />
-
-		<div class="shop_car" @click="shopCar">
-			<u-badge numberType="limit" type="error" max="99" :value="carNum"></u-badge>
-			<image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/shop_car_num.png"></image>
-			<!-- <image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/shop_car_empty.png"></image> -->
-		</div>
-
-	</div>
+    <div class="shop_car" @click="shopCar">
+      <u-badge
+        numberType="limit"
+        type="error"
+        max="99"
+        :value="carNum"
+      ></u-badge>
+      <image
+        src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/shop_car_num.png"
+      ></image>
+      <!-- <image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/shop_car_empty.png"></image> -->
+    </div>
+  </div>
 </template>
 
 <script>
-import {
-	apiArr
-} from '../../../api/shop';
-import {
-	picUrl,
-	menuButtonInfo,
-	request,
-	NavgateTo
-} from '../../../utils';
+import { apiArr } from "../../../api/shop";
+import { picUrl, menuButtonInfo, request, NavgateTo } from "../../../utils";
 export default {
+  data() {
+    return {
+      picUrl,
+      flag: false,
+      top: "",
+      localHeight: "",
+      search: "",
+      value: "1",
+      cateListShow: false,
+      iconList: [
+        {
+          icon: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/shop_icon1.png",
+          name: "休闲零食",
+        },
 
-	data() {
+        {
+          icon: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/shop_icon2.png",
+          name: "肉蛋果蔬",
+        },
+        {
+          icon: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/shop_icon3.png",
+          name: "酒水饮料",
+        },
+        {
+          icon: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/shop_icon4.png",
+          name: "家具电器",
+        },
+        {
+          icon: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/shop_icon5.png",
+          name: "电脑手机",
+        },
+        {
+          icon: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/shop_icon1.png",
+          name: "休闲零食",
+        },
+        {
+          icon: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/shop_icon2.png",
+          name: "肉蛋果蔬",
+        },
+        {
+          icon: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/shop_icon3.png",
+          name: "酒水饮料",
+        },
+        {
+          icon: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/shop_icon4.png",
+          name: "家具电器",
+        },
+        {
+          icon: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/shop_icon5.png",
+          name: "电脑手机",
+        },
+      ],
 
-		return {
-			picUrl,
-			flag: false,
-			top: "",
-			localHeight: "",
-			search: "",
-			value: "1",
-			cateListShow: false,
-			iconList: [
+      rightTopActive: 0,
+      topShow: false,
 
-				{
-					icon: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/shop_icon1.png",
-					name: "休闲零食"
-				},
+      GGshow: false,
+      CateList: [], //分类列表
+      currentFirstId: "",
+      leftCateList: [], //底部左侧分类
+      currentSecondId: "",
+      rightCateList: [], //底部右侧分类
+      currentThirdId: "",
 
-				{
-					icon: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/shop_icon2.png",
-					name: "肉蛋果蔬"
-				},
-				{
-					icon: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/shop_icon3.png",
-					name: "酒水饮料"
-				},
-				{
-					icon: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/shop_icon4.png",
-					name: "家具电器"
-				},
-				{
-					icon: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/shop_icon5.png",
-					name: "电脑手机"
-				},
-				{
-					icon: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/shop_icon1.png",
-					name: "休闲零食"
-				},
-				{
-					icon: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/shop_icon2.png",
-					name: "肉蛋果蔬"
-				},
-				{
-					icon: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/shop_icon3.png",
-					name: "酒水饮料"
-				},
-				{
-					icon: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/shop_icon4.png",
-					name: "家具电器"
-				},
-				{
-					icon: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/shop_icon5.png",
-					name: "电脑手机"
-				},
-			],
+      tagList: [],
+      carNum: "",
+    };
+  },
+  methods: {
+    changeCate(id) {
+      // 根据id查找对应的分类
+      const category = this.CateList.find((item) => item.id === id);
+      if (category) {
+        // 将leftCateList设置为该分类的二级分类，若为null则设为空数组
+        this.leftCateList = category.level_two_category || [];
+        this.secondId = this.leftCateList[0]?.id;
+        this.getGoodsList();
+      }
+    },
+    //顶部分类点击
+    changeCateListShow() {
+      this.cateListShow = !this.cateListShow;
+    },
+    //选择右下角分类
+    checkItem(index) {
+      this.rightTopActive = index;
+    },
+    //右下角点击更多
+    topOpen() {
+      this.topShow = !this.topShow;
+    },
+    // 选择商品规格
+    chooseGG(e) {
+      e.isShow = !e.isShow;
+    },
+    //搜索页
+    searchPage() {
+      NavgateTo("../search/index");
+    },
+    //商品详情页
+    goods(e) {
+      NavgateTo(`../goods/index?id=${e}`);
+    },
 
-			rightTopActive: 0,
-			topShow: false,
+    // 购物车
+    shopCar() {
+      NavgateTo("../shopCar/index");
+    },
+    //分类列表
+    getCateList() {
+      request(apiArr.goodsCateList, "POST", {}).then((res) => {
+        console.log(res);
+        this.CateList = res.commodity_category_list;
+        this.firstId = res.commodity_category_list[0].id;
+        this.leftCateList = res.commodity_category_list[0].level_two_category;
+        this.secondId = res.commodity_category_list[0].level_two_category[0].id;
+        this.getGoodsList();
+      });
+    },
 
-			GGshow: false,
-			CateList:[],//分类列表
-			currentFirstId:"",
-			leftCateList:[], //底部左侧分类
-			currentSecondId:"",
-			rightCateList:[], //底部右侧分类
-			currentThirdId:"",
+    getGoodsList() {
+      if (!this.secondId) {
+        this.tagList = [];
+        return;
+      }
+      request(apiArr.getGoodsList, "POST", {
+        user_id: uni.getStorageSync("userId"),
+        id: this.secondId,
+      }).then((res) => {
+        res.commodity_list.forEach((item) => {
+          item.commodity_info_list.forEach((item) => {
+            item.isShow = false;
+          });
+        });
+        this.tagList = res.commodity_list;
+      });
+    },
 
-			tagList:[],
-			carNum:"",
-		}
-	},
-	methods: {
-		//顶部分类点击
-		changeCateListShow() {
-			this.cateListShow = !this.cateListShow
-		},
-		//选择右下角分类
-		checkItem(index) {
-			this.rightTopActive = index
-		},
-		//右下角点击更多
-		topOpen() {
-			this.topShow = !this.topShow
-		},
-		// 选择商品规格
-		chooseGG(e) {
-			e.isShow = !e.isShow
-		},
-		//搜索页
-		searchPage() {
-			NavgateTo('../search/index')
-		},
-		//商品详情页
-		goods(e) {
-			NavgateTo(`../goods/index?id=${e}`)
-		},
+    getShopCarList() {
+      request(apiArr.getCar, "POST").then((res) => {
+        console.log(res);
+        this.carNum = res.total;
+      });
+    },
 
-		// 购物车
-		shopCar(){
-			NavgateTo("../shopCar/index")
-		},
-		//分类列表
-		getCateList(){
-			request(apiArr.goodsCateList,"POST",{}).then(res=>{
-				console.log(res);
-				this.CateList = res.commodity_category_list
-				this.firstId = res.commodity_category_list[0].id
-				this.leftCateList = res.commodity_category_list[0].level_two_category
-				this.secondId = res.commodity_category_list[0].level_two_category[0].id
-				this.getGoodsList()
-			})
-		},
-
-		getGoodsList(){
-			request(apiArr.getGoodsList,'POST',{
-				user_id:"",
-				id:this.secondId
-			}).then(res=>{
-				res.commodity_list.forEach(item => {
-					item.commodity_info_list.forEach(item=>{
-						item.isShow = false
-					})
-				});
-				this.tagList = res.commodity_list
-			})
-		},
-
-		getShopCarList(){
-			request(apiArr.getCar,"POST",).then(res=>{
-				console.log(res);
-				this.carNum = res.total
-			})
-		},
-
-		changeLeftCate(e){
-			this.secondId = e
-			this.getGoodsList()
-		},
-
-	},
-	onLoad(options) {
-		const meun = menuButtonInfo();
-		this.top = meun.top;
-		this.localHeight = meun.height;
-		this.getCateList()
-		this.getShopCarList()
-	},
-	onReachBottom() {
-		if (this.flag) {
-
-		}
-	},
-}
+    changeLeftCate(e) {
+      this.secondId = e;
+      this.getGoodsList();
+    },
+    //商品数量变化
+    handleQuantityChange(item) {
+      console.log("🚀 ~ handleQuantityChange ~ value:", item);
+      const goodsId = "";
+      if (item.commodity_goods_info_list.length) {
+        this.goodsId = item.commodity_goods_info_list[0].id;
+      } else {
+        this.goodsId = item.id;
+      }
+      const params = {
+        user_id: uni.getStorageSync("userId"),
+        goods_id_and_count: [
+          {
+            goods_id: this.goodsId,
+            count: item.quantity ? item.quantity + 1 : 1,
+          },
+        ],
+      };
+      console.log("🚀 ~ handleQuantityChange ~ params:", params);
+      request(apiArr.updateCar, "POST", params).then((res) => {
+        console.log(res);
+        uni.showToast({
+          title: "操作成功！",
+          success() {
+            // setTimeout(() => {
+            // 	that.getBanlance()
+            // }, 1500)
+          },
+        });
+      });
+    },
+  },
+  onLoad(options) {
+    const meun = menuButtonInfo();
+    this.top = meun.top;
+    this.localHeight = meun.height;
+    this.getCateList();
+    this.getShopCarList();
+  },
+  onReachBottom() {
+    if (this.flag) {
+    }
+  },
+};
 </script>
 
 <style>

From dfbfb0440e212c482239346e1c4af08bc656ccd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AF=85?= <1335909236@qq.com>
Date: Fri, 18 Jul 2025 10:16:02 +0800
Subject: [PATCH 5/7] =?UTF-8?q?fix=20:=20=E4=BF=AE=E6=94=B9=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E9=A6=96=E9=A1=B5=E5=95=86=E5=93=81=E5=8A=A0=E5=85=A5?=
 =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E6=97=B6=E7=9A=84=E8=B4=AD=E7=89=A9?=
 =?UTF-8?q?=E8=BD=A6=E7=9A=84=E6=95=B0=E9=87=8F=E6=98=BE=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/shop/index/index.vue | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/packages/shop/index/index.vue b/packages/shop/index/index.vue
index 4bcdc7e3..5f4e6789 100644
--- a/packages/shop/index/index.vue
+++ b/packages/shop/index/index.vue
@@ -176,7 +176,7 @@
                     <u-number-box
                       :min="0"
                       v-model="items.quantity"
-                      @change="handleQuantityChange(items)"
+                      @change="(value) => handleQuantityChange(value,items)"
                     >
                       <view slot="minus" class="minus">
                         <u-icon name="minus" size="20"></u-icon>
@@ -244,7 +244,7 @@
                       <u-number-box
                         v-model="ite.quantity"
                         :min="0"
-                        @change="handleQuantityChange(ite)"
+                        @change="(value) => handleQuantityChange(value,ite)"
                       >
                         <view slot="minus" class="minus">
                           <u-icon name="minus" size="20"></u-icon>
@@ -452,9 +452,7 @@ export default {
       this.getGoodsList();
     },
     //商品数量变化
-    handleQuantityChange(item) {
-      console.log("🚀 ~ handleQuantityChange ~ value:", item);
-      const goodsId = "";
+    handleQuantityChange(val,item) {
       if (item.commodity_goods_info_list.length) {
         this.goodsId = item.commodity_goods_info_list[0].id;
       } else {
@@ -465,19 +463,16 @@ export default {
         goods_id_and_count: [
           {
             goods_id: this.goodsId,
-            count: item.quantity ? item.quantity + 1 : 1,
+            count: val.value,
           },
         ],
       };
-      console.log("🚀 ~ handleQuantityChange ~ params:", params);
       request(apiArr.updateCar, "POST", params).then((res) => {
         console.log(res);
+        this.getShopCarList();
         uni.showToast({
           title: "操作成功！",
           success() {
-            // setTimeout(() => {
-            // 	that.getBanlance()
-            // }, 1500)
           },
         });
       });
@@ -488,6 +483,9 @@ export default {
     this.top = meun.top;
     this.localHeight = meun.height;
     this.getCateList();
+    // this.getShopCarList();
+  },
+  onShow() {
     this.getShopCarList();
   },
   onReachBottom() {

From f8c37680a4bd7bffb67b5d8ee144dd99c6bcb209 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AF=85?= <1335909236@qq.com>
Date: Fri, 18 Jul 2025 10:41:08 +0800
Subject: [PATCH 6/7] =?UTF-8?q?style=20:=20=E4=BC=98=E5=8C=96=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E9=A6=96=E9=A1=B5=E5=B7=A6=E4=BE=A7=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E6=A0=8F=E7=9A=84=E9=80=89=E4=B8=AD=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/shop/index/index.css |  4 ++++
 packages/shop/index/index.vue | 14 +++++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/packages/shop/index/index.css b/packages/shop/index/index.css
index 5c34f82d..6ef2055d 100644
--- a/packages/shop/index/index.css
+++ b/packages/shop/index/index.css
@@ -132,6 +132,10 @@ page {
     padding: 35rpx 0;
 }
 
+.CateItem_active {
+    background-color: #ffffff;
+}
+
 .CateItem .hot {
     width: 25.82rpx;
     height: 30rpx;
diff --git a/packages/shop/index/index.vue b/packages/shop/index/index.vue
index 5f4e6789..de7d35b9 100644
--- a/packages/shop/index/index.vue
+++ b/packages/shop/index/index.vue
@@ -90,7 +90,7 @@
     <div class="Con">
       <div class="Con_left">
         <div
-          class="CateItem"
+          class="CateItem" :class="item.id === currentLeftCateId ? 'CateItem_active' : ''"
           v-for="item in leftCateList"
           :key="item.id"
           @click="changeLeftCate(item.id)"
@@ -356,6 +356,7 @@ export default {
       ],
 
       rightTopActive: 0,
+currentLeftCateId: null,
       topShow: false,
 
       GGshow: false,
@@ -416,8 +417,14 @@ export default {
         console.log(res);
         this.CateList = res.commodity_category_list;
         this.firstId = res.commodity_category_list[0].id;
-        this.leftCateList = res.commodity_category_list[0].level_two_category;
-        this.secondId = res.commodity_category_list[0].level_two_category[0].id;
+        this.leftCateList = res.commodity_category_list[0].level_two_category || [];
+        if (this.leftCateList.length > 0) {
+          this.currentLeftCateId = this.leftCateList[0].id;
+          this.secondId = this.leftCateList[0].id;
+        } else {
+          this.currentLeftCateId = null;
+          this.secondId = null;
+        }
         this.getGoodsList();
       });
     },
@@ -448,6 +455,7 @@ export default {
     },
 
     changeLeftCate(e) {
+      this.currentLeftCateId = e;
       this.secondId = e;
       this.getGoodsList();
     },

From b027a8f8ce4968fc5c81a77e54c67397c08fb92f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AF=85?= <1335909236@qq.com>
Date: Fri, 18 Jul 2025 15:44:28 +0800
Subject: [PATCH 7/7] =?UTF-8?q?fix=20:=20=E4=BC=98=E5=8C=96=E5=85=AC?=
 =?UTF-8?q?=E5=91=8A=E9=83=A8=E5=88=86=E7=9A=84=E6=95=B0=E6=8D=AE=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/community/index/index.vue | 54 +++++++++++++++++++++---------
 1 file changed, 39 insertions(+), 15 deletions(-)

diff --git a/packages/community/index/index.vue b/packages/community/index/index.vue
index 604be385..c04534d8 100644
--- a/packages/community/index/index.vue
+++ b/packages/community/index/index.vue
@@ -112,7 +112,7 @@
       </div>
     </div>
 
-    <div class="tips">下拉加载后续10条，共计30条</div>
+    <div class="tips">{{ loadMoreText }}</div>
 
     <div class="bigAds" v-if="ads1Show">
       <div class="bigAdsCon">
@@ -208,6 +208,7 @@ export default {
       page_size: 10,
       page_num: 1,
       flag: false,
+      loadMoreText: "下拉加载后续10条，共计30条",
     };
   },
   async onLoad(options) {
@@ -248,7 +249,10 @@ export default {
   onReachBottom() {
     if (this.flag) {
       this.page_num++;
-      this.getCategoryList();
+      const currentItem = this.categoryList[this.selectedTab];
+      if (currentItem) {
+        this.selectTab(this.selectedTab, currentItem);
+      }
     }
   },
 
@@ -481,6 +485,12 @@ export default {
     },
 
     async selectTab(index, item) {
+      const isTabChange = this.selectedTab !== index;
+      if (isTabChange) {
+        this.page_num = 1;
+        this.infoList = [];
+        this.loadMoreText = "下拉加载后续10条，共计30条";
+      }
       this.selectedTab = index;
       console.log("选中的tab:", index);
       const res = await request(apiArr.infoPage, "POST", {
@@ -491,20 +501,34 @@ export default {
         page_num: this.page_num,
         page_size: this.page_size,
       });
-      if (res.rows && res.rows.length == this.page_size) {
-        this.flag = true;
-      } else {
-        this.flag = false;
-      }
-      res.rows = res.rows.map((item) => {
-        return {
-          ...item,
-          list_image: picUrl + item.list_image,
-        };
-      });
-      this.infoList.splice(0, this.infoList.length);
 
-      this.infoList = this.infoList.concat(res.rows);
+      // 处理数据
+      const newData = res.rows.map((item) => ({
+        ...item,
+        list_image: picUrl + item.list_image,
+      }));
+
+      // 判断是否还有更多数据
+      const hasMore = res.rows.length === this.page_size;
+      // 限制最多3页
+      this.flag = hasMore;
+
+      // 更新数据
+      if (isTabChange) {
+        this.infoList = newData;
+      } else {
+        this.infoList = this.infoList.concat(newData);
+      }
+
+      // 更新提示文本
+      if (this.infoList.length > 10 && !hasMore) {
+        uni.showToast({
+          title: "没有更多了",
+          icon: "none",
+        });
+      } else {
+        this.loadMoreText = `下拉加载后续10条`;
+      }
     },
 
     detail(e) {