From b49ee49312deb82b73a09a61848daf57bfd41c29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9C13713575202=E2=80=9D?= <“1345916905@qq.com”>
Date: Mon, 14 Apr 2025 16:47:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E4=BB=BD=E5=89=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/userCenter/shoppingCart.vue     |  4 +-
 .../src/views/userCenter/userOrders.vue       | 57 ++++++++++++++++---
 2 files changed, 50 insertions(+), 11 deletions(-)

diff --git a/sub-operation-service/src/views/userCenter/shoppingCart.vue b/sub-operation-service/src/views/userCenter/shoppingCart.vue
index 457ec6b..032d4fb 100644
--- a/sub-operation-service/src/views/userCenter/shoppingCart.vue
+++ b/sub-operation-service/src/views/userCenter/shoppingCart.vue
@@ -249,12 +249,12 @@ const doSingleDel = (indexP, index) => {
   width: 100%;
   .page-content-warp {
     width: 100%;
-    height: calc(100vh - 116px);
+    height: calc(100vh - 135px);
     position: relative;
     background: $color-fff;
     border-radius: 16px;
     overflow: hidden;
-    margin: 16px 0;
+    margin: 16px 0 0 16px;
     .fix-top,
     .fix-bottom {
       position: absolute;
diff --git a/sub-operation-service/src/views/userCenter/userOrders.vue b/sub-operation-service/src/views/userCenter/userOrders.vue
index 2550f52..d3af6d8 100644
--- a/sub-operation-service/src/views/userCenter/userOrders.vue
+++ b/sub-operation-service/src/views/userCenter/userOrders.vue
@@ -32,23 +32,23 @@
             <div v-if="o.goodlist && o.goodlist.length > 0" class="order-item-content">
               <div class="content-list">
                 <div v-for="(g, indexg) in o.goodlist" :key="indexg" class="good-item">
-                  <div class="good-img" @click="toCheckGood(index, indexg)">
+                  <div class="good-img">
                     <costomImg
                       :url="'images/ecommerce/' + 'pic.png'"
                       :preview-list="[getAssetsFile('images/ecommerce/' + 'pic.png')?.href ?? '']"
                       :is-view="false"
                     ></costomImg>
                   </div>
-                  <div class="good-info" @click="toCheckGood(index, indexg)">
+                  <div class="good-info">
                     <div class="good-info-pos">
                       <div class="txt-ellipsis clamp2">{{ g.title || '--' }}</div>
                     </div>
                   </div>
                   <div class="good-price-num">
                     <div class="good-price-num-pos">
-                      <div class="price" @click="toCheckGood(index, indexg)">{{ g.price }} / {{ g.unit }} * {{ g.num }}</div>
-                      <div class="total" @click="toCheckGood(index, indexg)">
-                        <div class="amount">{{ (g.price * g.num).toFixed(2) }}</div>
+                      <div class="price">{{ g.price }} / {{ g.unit }} * {{ g.num }}</div>
+                      <div class="total">
+                        <div class="amount">{{ (g.price * g.num + g.carriage).toFixed(2) }}</div>
                         <div class="carriage">( 含运费{{ g.carriage.toFixed(2) }})</div>
                       </div>
                     </div>
@@ -56,7 +56,17 @@
                 </div>
               </div>
               <div class="content-right">
-                <div class="content-right-pos"></div>
+                <div class="content-right-pos">
+                  <div v-if="o.status == 0" class="right-item do-btn">
+                    <el-button type="primary" @click="doPay">立即付款</el-button>
+                  </div>
+                  <div v-if="o.status == 0" class="right-item do-btn">
+                    <el-button @click="doPay">取消订单</el-button>
+                  </div>
+                  <div v-if="o.status != 0" class="right-item">已发货</div>
+                  <div v-if="o.status != 0" class="right-item text-link">快递单号</div>
+                  <div class="right-item text-link">订单详情</div>
+                </div>
               </div>
             </div>
           </div>
@@ -88,7 +98,8 @@ let orderList = reactive([
     id: '1',
     orderNo: 'YH8888888888',
     createTime: '2025.01.01 10:00:00',
-    payAmount: 147,
+    payAmount: 81,
+    status: 0,
     goodlist: [
       { id: '001', title: '耿马镇 原生态 有机 西红柿', price: 4.9, unit: '份', num: 10, carriage: 6 },
       { id: '002', title: '耿马镇 原生态 有机 西蓝花', price: 2.6, unit: '份', num: 10, carriage: 0 },
@@ -98,14 +109,28 @@ let orderList = reactive([
     id: '2',
     orderNo: 'YH8888888889',
     createTime: '2025.02.01 10:00:00',
-    payAmount: 147,
+    payAmount: 110,
+    status: 1,
     goodlist: [
       { id: '001', title: '耿马镇 原生态 有机 西红柿', price: 4.8, unit: '份', num: 10, carriage: 6 },
       { id: '002', title: '耿马镇 原生态 有机 西蓝花', price: 2.5, unit: '份', num: 10, carriage: 6 },
       { id: '002', title: '耿马镇 原生态 有机 茄子', price: 2.5, unit: '份', num: 10, carriage: 0 },
     ],
   },
+  {
+    id: '3',
+    orderNo: 'YH8888888899',
+    createTime: '2025.02.01 10:00:00',
+    payAmount: 85,
+    status: 2,
+    goodlist: [
+      { id: '001', title: '勐简镇 原生态 有机 西红柿', price: 4.8, unit: '份', num: 10, carriage: 6 },
+      { id: '002', title: '勐简镇 原生态 有机 西蓝花', price: 2.5, unit: '份', num: 10, carriage: 6 },
+    ],
+  },
 ]);
+
+const doPay = () => {};
 </script>
 <style lang="scss" scoped>
 .user-orders-warp {
@@ -202,7 +227,7 @@ let orderList = reactive([
             vertical-align: top;
           }
           .content-list {
-            width: 100%;
+            width: calc(100% - 160px);
             .good-item {
               display: inline-flex;
               width: 100%;
@@ -265,10 +290,24 @@ let orderList = reactive([
             }
           }
           .content-right {
+            width: 160px;
             display: inline-flex;
             justify-content: center;
             flex-direction: column;
+            text-align: center;
             .content-right-pos {
+              .text-normal {
+                cursor: pointer;
+                font-size: 16px;
+              }
+              .text-link {
+                color: $color-main;
+                cursor: pointer;
+                font-size: 16px;
+              }
+            }
+            .do-btn {
+              margin-top: 8px;
             }
           }
         }