From 85882c9a68136469e756cb68814f9d76b274eca3 Mon Sep 17 00:00:00 2001
From: 13713575202 <1345916905@qq.com>
Date: Wed, 11 Jun 2025 13:53:06 +0800
Subject: [PATCH 1/2] xiabin

---
 sub-operation-service/src/apis/user.js        |  4 +-
 .../src/views/userCenter/orderDetails.vue     | 57 +++++++++++----
 .../src/views/userCenter/shoppingCart.vue     | 15 ++--
 .../src/views/userCenter/sureOrder.vue        |  6 +-
 .../src/views/userCenter/userOrders.vue       | 70 +++++++++++++++++--
 5 files changed, 123 insertions(+), 29 deletions(-)

diff --git a/sub-operation-service/src/apis/user.js b/sub-operation-service/src/apis/user.js
index 1d5c2e7..238abbf 100644
--- a/sub-operation-service/src/apis/user.js
+++ b/sub-operation-service/src/apis/user.js
@@ -9,8 +9,8 @@ export function shoppingCart(params = {}) {
 //删除购物车
 export function deleteChooseGoods(params = {}) {
   return request('user-center/shoppingCart/deleteChooseGoods', {
-    method: 'GET',
-    params,
+    method: 'POST',
+    data: params,
   });
 }
 //商品添加数量
diff --git a/sub-operation-service/src/views/userCenter/orderDetails.vue b/sub-operation-service/src/views/userCenter/orderDetails.vue
index 5b9e52a..153e4ef 100644
--- a/sub-operation-service/src/views/userCenter/orderDetails.vue
+++ b/sub-operation-service/src/views/userCenter/orderDetails.vue
@@ -109,14 +109,22 @@
                     <div>付款时间</div>
                     <div style="color: #999999">{{ detailsData.paymentTime }}</div>
                   </div>
-                  <div v-if="detailsData.orderStatus == '11'" class="order-list-warp-right-list">
-                    <div>退款时间</div>
+                  <div v-if="detailsData.orderStatus == '11' || detailsData.orderStatus == '10'" class="order-list-warp-right-list">
+                    <div>申请退款原因</div>
+                    <div style="color: #999999">{{ detailsData.refundReason }}</div>
+                  </div>
+                  <div v-if="detailsData.orderStatus == '11' || detailsData.orderStatus == '10'" class="order-list-warp-right-list">
+                    <div>申请退款时间</div>
                     <div style="color: #999999">{{ detailsData.refundTime }}</div>
                   </div>
-                  <div v-if="detailsData.orderStatus == '11'" class="order-list-warp-right-list">
-                    <div>退款金额</div>
+                  <div v-if="detailsData.orderStatus == '11' || detailsData.orderStatus == '10'" class="order-list-warp-right-list">
+                    <div style="color: red">申请退款金额</div>
                     <div style="color: red">{{ detailsData.refundAmount }}</div>
                   </div>
+                  <div v-if="detailsData.orderStatus == '11' || detailsData.orderStatus == '10'" class="order-list-warp-right-list">
+                    <div>申请退款结果</div>
+                    <div>{{ detailsData.refundAuditResult }}</div>
+                  </div>
                 </div>
                 <div v-if="detailsData.totalAmount" style="margin-top: 30px">
                   <div style="width: 100%; text-align: left; font-size: 18px; font-weight: bold">付款信息</div>
@@ -141,19 +149,17 @@
             </div>
             <div style="display: flex; align-items: center; justify-content: center; width: 100%">
               <div v-if="detailsData.orderStatus == '1'" class="button-bottom" @click="doPay(1)">立即付款</div>
-              <div
-                v-if="
-                  detailsData.orderStatus == '2' || detailsData.orderStatus == '3' || detailsData.orderStatus == '4' || detailsData.orderStatus == '5'
-                "
-                class="button-bottom"
-                @click="confirmReceipt()"
-              >
+              <div v-if="detailsData.orderStatus == '4' || detailsData.orderStatus == '5'" class="button-bottom" @click="confirmReceipt()">
                 确认收货
               </div>
               <div v-if="detailsData.orderStatus == '2' || detailsData.orderStatus == '3'" class="button-bottoms" @click="reAddress()">修改地址</div>
               <div
                 v-if="
-                  detailsData.orderStatus == '2' || detailsData.orderStatus == '3' || detailsData.orderStatus == '4' || detailsData.orderStatus == '5'
+                  detailsData.orderStatus == '2' ||
+                  detailsData.orderStatus == '3' ||
+                  detailsData.orderStatus == '4' ||
+                  detailsData.orderStatus == '5' ||
+                  detailsData.orderStatus == '6'
                 "
                 class="button-bottoms"
                 @click="refund()"
@@ -170,7 +176,8 @@
   </div>
 </template>
 <script setup>
-import { userPostAddress, upOrderInfoList, confirmOrder, refundApprove } from '../../apis/user';
+import { ElMessage } from 'element-plus';
+import { userPostAddress, upOrderInfoList, confirmOrder, refundApprove, sureToReceive } from '../../apis/user';
 import common from './components/common.vue';
 import { ref, reactive, computed, onMounted } from 'vue';
 import userHeader from './components/userHeader.vue';
@@ -219,7 +226,14 @@ onMounted(() => {
 });
 
 const confirmReceipt = () => {
-  getDetails();
+  sureToReceive({ orderId: detailsData.value.id }).then((res) => {
+    ElMessage({
+      message: '确认收货成功',
+      type: 'success',
+      plain: true,
+    });
+    getDetails();
+  });
 };
 
 const change = (value) => {
@@ -240,6 +254,11 @@ const changeAddress = (value) => {
 const doCancel = () => {
   cancelOrder({ id: route.query.id }).then((res) => {
     store.getData(JSON.parse(route.query.page)).then((res) => {
+      ElMessage({
+        message: '取消订单成功',
+        type: 'success',
+        plain: true,
+      });
       router.back();
     });
   });
@@ -256,6 +275,11 @@ const upRefund = () => {
     refundType: optionsValue.value,
     refundReason: input.value,
   }).then((res) => {
+    ElMessage({
+      message: '退货/退款成功',
+      type: 'success',
+      plain: true,
+    });
     getDetails();
     refundVs.value = false;
   });
@@ -263,6 +287,11 @@ const upRefund = () => {
 
 const upAddress = () => {
   updateOrderReceiveAddress({ orderId: route.query.id, addressId: addressId.value }).then((res) => {
+    ElMessage({
+      message: '修改地址成功',
+      type: 'success',
+      plain: true,
+    });
     getDetails();
     dialogVisible.value = false;
   });
diff --git a/sub-operation-service/src/views/userCenter/shoppingCart.vue b/sub-operation-service/src/views/userCenter/shoppingCart.vue
index 39bb878..f986bcd 100644
--- a/sub-operation-service/src/views/userCenter/shoppingCart.vue
+++ b/sub-operation-service/src/views/userCenter/shoppingCart.vue
@@ -113,7 +113,7 @@ let isAll = ref(false);
 let data = ref([]);
 let page = reactive({
   current: 1,
-  size: 10,
+  size: 100,
 });
 let ids = ref([]);
 
@@ -260,6 +260,7 @@ const toCheckGood = (indexP, index) => {
     // 如果值不存在则添加
     ids.value.push(data.value[indexP].cartDetails[index].id);
   }
+  console.log(ids.value);
   if (indexP > -1 && index > -1) {
     let list = data.value[indexP].cartDetails;
     list[index].ischeck = !list[index].ischeck;
@@ -295,6 +296,8 @@ const setIsAll = () => {
 };
 
 const doSingleDel = (indexP, index) => {
+  let list = [];
+  list.push(data.value[indexP].cartDetails[index].id);
   if (indexP > -1 && index > -1) {
     app
       .$confirm(`删除后信息将不可查看，确认要删除吗？`, '确定删除', {
@@ -303,10 +306,12 @@ const doSingleDel = (indexP, index) => {
         type: 'warning',
       })
       .then(() => {
-        deleteChooseGoods({ goodsIds: [data.value[indexP].cartDetails[index].id] });
+        deleteChooseGoods({ goodsIds: list.join(',') });
         data.value[indexP].cartDetails.splice(index, 1);
       })
-      .catch(() => {});
+      .catch((err) => {
+        console.log(err);
+      });
   }
 };
 //批量删除
@@ -327,9 +332,9 @@ const doBatchDel = () => {
       })
       .then(() => {
         //  删除逻辑
-        const filteredData = removeCheckedItems(data);
+        // const filteredData = removeCheckedItems(data);
         // console.log(filteredData);
-        data.value = filteredData;
+        // data.value = filteredData;
         deleteChooseGoods(ids.value);
       })
       .catch(() => {});
diff --git a/sub-operation-service/src/views/userCenter/sureOrder.vue b/sub-operation-service/src/views/userCenter/sureOrder.vue
index 80282a4..0e709be 100644
--- a/sub-operation-service/src/views/userCenter/sureOrder.vue
+++ b/sub-operation-service/src/views/userCenter/sureOrder.vue
@@ -7,7 +7,7 @@
           <div class="addr-list">
             <div class="addr-list-top">
               <div class="back">
-                <el-icon><ArrowLeftBold /></el-icon>
+                <el-icon @click="goBack()"><ArrowLeftBold /></el-icon>
                 <span>确认收货地址</span>
               </div>
               <div class="addr-manage" @click="goAddressList()">管理地址</div>
@@ -184,6 +184,10 @@ const getAddressList = () => {
   });
 };
 
+const goBack = () => {
+  router.back();
+};
+
 const getOrderInfo = () => {
   upOrderInfoList({ id: route.query.id }).then((res) => {
     datalist.value = res.data.records;
diff --git a/sub-operation-service/src/views/userCenter/userOrders.vue b/sub-operation-service/src/views/userCenter/userOrders.vue
index eb03298..4f45dbc 100644
--- a/sub-operation-service/src/views/userCenter/userOrders.vue
+++ b/sub-operation-service/src/views/userCenter/userOrders.vue
@@ -49,11 +49,17 @@
                         <div class="good-info">
                           <div class="good-info-pos">
                             <div class="txt-ellipsis clamp2">{{ g.productName || '--' }}</div>
+                            <div
+                              v-if="g.refundAuditResult == '2' && (g.orderStatus = '10' || g.orderStatus == '11')"
+                              style="color: red; font-size: 15px"
+                            >
+                              已拒绝退款：该产品不支持退货/退款
+                            </div>
                           </div>
                         </div>
                         <div class="good-price-num">
                           <div class="good-price-num-pos">
-                            <div class="price">{{ g.unitPrice }} / {{ g.unit }} * {{ g.quantity }}</div>
+                            <div class="price">￥{{ g.unitPrice }} / {{ g.unit }} * {{ g.quantity }}</div>
                             <div class="total">
                               <div class="amount">{{ (g.unitPrice * g.quantity).toFixed(2) }}</div>
                               <!-- <div class="amount">{{ (g.unitPrice * g.quantity + g.carriage).toFixed(2) }}</div> -->
@@ -74,6 +80,14 @@
                         <div v-if="o.orderStatus == '1'" class="right-item do-btn">
                           <el-button @click="doCancel(o.id)">取消订单</el-button>
                         </div>
+
+                        <div
+                          v-if="o.orderStatus == '2' || o.orderStatus == '3' || o.orderStatus == '4' || o.orderStatus == '5'"
+                          class="right-item do-btn"
+                        >
+                          <el-button type="danger" @click="doPay(o.id)">退货/退款</el-button>
+                        </div>
+
                         <!-- <div v-if="o.orderStatus == '5'" class="right-item">已发货</div> -->
                         <!-- <div v-if="o.orderStatus == '5'" class="right-item text-link">快递单号</div> -->
                         <el-button type="primary" class="right-item do-btn" @click="goInfo(o.id)">订单详情</el-button>
@@ -101,6 +115,10 @@
                   </div>
                 </div>
               </div>
+              <div class="pager">
+                <div style="margin-bottom: 3px">共{{ total }}条</div>
+                <el-pagination :page-size="20" :pager-count="11" layout="prev, pager, next" :total="total" @change="pagerChange" />
+              </div>
             </div>
           </div>
         </div>
@@ -109,6 +127,7 @@
   </div>
 </template>
 <script setup>
+import { ElMessage } from 'element-plus';
 import common from './components/common.vue';
 import { ref, reactive, onMounted } from 'vue';
 import { isEmpty, getAssetsFile } from '@/utils';
@@ -121,14 +140,31 @@ const route = useRoute();
 const router = useRouter();
 let page = reactive({
   current: 1,
-  size: 10,
+  size: 20,
 });
+let total = ref(0);
 let show = ref(false);
 let handleClick = (value) => {
   activeCurrent.value = value;
   page.orderStatus = value;
+  if (value == 5) {
+    page.orderStatus = value + ',4';
+  }
+  store.getData(page).then((res) => {
+    total.value = res.total;
+    if (res.records.length > 0) {
+      show.value = true;
+    } else {
+      show.value = false;
+    }
+    console.log(show.value);
+  });
+};
+
+const pagerChange = (value) => {
+  console.log(page);
+  page.current = value;
   store.getData(page).then((res) => {
-    console.log(res);
     if (res.records.length > 0) {
       show.value = true;
     } else {
@@ -150,7 +186,7 @@ let bottomList = reactive([
   { title: '待付款', name: '1' },
   { title: '待发货', name: '3' },
   // { title: '已发货', name: '6' },
-  { title: '待收货', name: '5' },
+  { title: '待收货', name: '4' },
   { title: '已收货', name: '6' },
   { title: '退款中', name: '10' },
   { title: '已退款', name: '11' },
@@ -159,6 +195,7 @@ let bottomList = reactive([
 onMounted(() => {
   page.orderStatus = 'all';
   store.getData(page).then((res) => {
+    total.value = res.total;
     if (res.records.length > 0) {
       show.value = true;
     } else {
@@ -169,6 +206,11 @@ onMounted(() => {
 
 const sureToReceives = (id) => {
   sureToReceive({ orderId: id }).then((res) => {
+    ElMessage({
+      message: '确认收货成功',
+      type: 'success',
+      plain: true,
+    });
     store.getData(page);
   });
 };
@@ -214,23 +256,36 @@ let orderList = reactive([
 
 const doPay = (id) => {
   router.push({
-    path: '/sub-operation-service/orderSuccess',
-    query: { id: id },
+    path: '/sub-operation-service/orderDetails',
+    query: { id: id, page: JSON.stringify(page) },
   });
 };
 
 const doCancel = (id) => {
   cancelOrder({ id: id }).then((res) => {
+    ElMessage({
+      message: '取消订单成功',
+      type: 'success',
+      plain: true,
+    });
     store.getData(page);
   });
 };
 </script>
 <style lang="scss" scoped>
+.pager {
+  align-items: center;
+  display: flex;
+  position: fixed;
+  bottom: 42px;
+  color: #999999;
+  font-size: 12px;
+}
 .user-orders-warp {
   width: 100%;
   .user-orders-content {
     margin-top: 16px;
-    padding: 16px;
+    padding: 16px 16px 30px 16px;
     width: 100%;
     height: calc(100vh - 136px);
     border-radius: 16px;
@@ -265,6 +320,7 @@ const doCancel = (id) => {
     }
   }
   .order-list-warp {
+    position: relative;
     overflow-y: auto;
     width: 100%;
     height: calc(100% - 60px);

From e407f9faea6621a0e98d35cc2ade191b20a8f894 Mon Sep 17 00:00:00 2001
From: 13713575202 <1345916905@qq.com>
Date: Wed, 11 Jun 2025 14:35:58 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A4=8F=E6=BB=A8=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/userCenter/orderDetails.vue     | 10 ++++--
 .../src/views/userCenter/shoppingCart.vue     | 33 +++++++++++++------
 .../src/views/userCenter/userOrders.vue       |  7 ++--
 3 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/sub-operation-service/src/views/userCenter/orderDetails.vue b/sub-operation-service/src/views/userCenter/orderDetails.vue
index 153e4ef..6187790 100644
--- a/sub-operation-service/src/views/userCenter/orderDetails.vue
+++ b/sub-operation-service/src/views/userCenter/orderDetails.vue
@@ -115,16 +115,20 @@
                   </div>
                   <div v-if="detailsData.orderStatus == '11' || detailsData.orderStatus == '10'" class="order-list-warp-right-list">
                     <div>申请退款时间</div>
-                    <div style="color: #999999">{{ detailsData.refundTime }}</div>
+                    <div style="color: #999999">{{ detailsData.refundApproveTime }}</div>
                   </div>
                   <div v-if="detailsData.orderStatus == '11' || detailsData.orderStatus == '10'" class="order-list-warp-right-list">
                     <div style="color: red">申请退款金额</div>
-                    <div style="color: red">{{ detailsData.refundAmount }}</div>
+                    <div style="color: red">￥{{ detailsData.payableAmount }}</div>
                   </div>
-                  <div v-if="detailsData.orderStatus == '11' || detailsData.orderStatus == '10'" class="order-list-warp-right-list">
+                  <div v-if="detailsData.orderStatus == '10' || detailsData.orderStatus == '11'" class="order-list-warp-right-list">
                     <div>申请退款结果</div>
                     <div>{{ detailsData.refundAuditResult }}</div>
                   </div>
+                  <div v-if="detailsData.orderStatus == '10' && detailsData.refundFailReason" class="order-list-warp-right-list">
+                    <div>拒绝退款原因</div>
+                    <div>{{ detailsData.refundFailReason }}</div>
+                  </div>
                 </div>
                 <div v-if="detailsData.totalAmount" style="margin-top: 30px">
                   <div style="width: 100%; text-align: left; font-size: 18px; font-weight: bold">付款信息</div>
diff --git a/sub-operation-service/src/views/userCenter/shoppingCart.vue b/sub-operation-service/src/views/userCenter/shoppingCart.vue
index f986bcd..9321329 100644
--- a/sub-operation-service/src/views/userCenter/shoppingCart.vue
+++ b/sub-operation-service/src/views/userCenter/shoppingCart.vue
@@ -23,19 +23,19 @@
             <div v-else class="conetnt-warp">
               <div class="content-item-warp">
                 <div v-for="(n, index) in data" :key="n.id" class="content-item">
-                  <div class="shop-info" @click="toCheckShop(index)">
-                    <div class="shop-do">
-                      <ischeck :value="n.ischeck"></ischeck>
-                    </div>
-                    <!-- <div class="shop-img">
+                  <!-- <div class="shop-img">
                       <costomImg
                         :url="'images/ecommerce/' + 'pic.png'"
                         :preview-list="[getAssetsFile('images/ecommerce/' + 'pic.png')?.href ?? '']"
                         :is-view="false"
                       ></costomImg>
                     </div> -->
+                  <!-- <div class="shop-info" @click="toCheckShop(index)">
+                    <div class="shop-do">
+                      <ischeck :value="n.ischeck"></ischeck>
+                    </div>
                     <span class="shop-name txt-ellipsis clamp2">{{ n.cartName }}</span>
-                  </div>
+                  </div> -->
 
                   <div v-if="n.cartDetails && n.cartDetails.length > 0" class="good-list">
                     <div v-for="(g, indexg) in n.cartDetails" :key="indexg" class="good-item">
@@ -223,12 +223,18 @@ const toCheckAll = () => {
       m.ischeck = isAll.value;
       if (m.cartDetails && m.cartDetails.length > 0) {
         m.cartDetails = setCheck(m.cartDetails, isAll.value);
-        m.cartDetails.forEach((res, index) => {
-          ids.value.push(res.id);
-        });
+        if (isAll.value) {
+          m.cartDetails.forEach((res, index) => {
+            ids.value.push(res.id);
+          });
+        } else {
+          ids.value = [];
+        }
       }
     });
   }
+
+  console.log(ids.value);
 };
 
 const setCheck = (data, val) => {
@@ -335,7 +341,14 @@ const doBatchDel = () => {
         // const filteredData = removeCheckedItems(data);
         // console.log(filteredData);
         // data.value = filteredData;
-        deleteChooseGoods(ids.value);
+        deleteChooseGoods({ goodsIds: ids.value.join(',') });
+        setTimeout(() => {
+          shoppingCart(page).then((res) => {
+            console.log(res.data.records);
+            data.value = res.data.records;
+            addIsCheckProperty(data);
+          });
+        }, 500);
       })
       .catch(() => {});
   }
diff --git a/sub-operation-service/src/views/userCenter/userOrders.vue b/sub-operation-service/src/views/userCenter/userOrders.vue
index 4f45dbc..fe9a1e9 100644
--- a/sub-operation-service/src/views/userCenter/userOrders.vue
+++ b/sub-operation-service/src/views/userCenter/userOrders.vue
@@ -49,11 +49,8 @@
                         <div class="good-info">
                           <div class="good-info-pos">
                             <div class="txt-ellipsis clamp2">{{ g.productName || '--' }}</div>
-                            <div
-                              v-if="g.refundAuditResult == '2' && (g.orderStatus = '10' || g.orderStatus == '11')"
-                              style="color: red; font-size: 15px"
-                            >
-                              已拒绝退款：该产品不支持退货/退款
+                            <div v-if="o.refundAuditResult == '拒绝退款' && o.orderStatus == '10'" style="color: red; font-size: 15px">
+                              已拒绝退款：{{ o.refundFailReason }}
                             </div>
                           </div>
                         </div>