夏滨修改订单

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>

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-img">
-                    <div class="shop-do">
-                      <ischeck :value="n.ischeck"></ischeck>
-                    </div>
-                    <!-- <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) => {
+        if (isAll.value) {
-          ids.value.push(res.id);
+          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(() => {});
   }

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
+                            <div v-if="o.refundAuditResult == '拒绝退款' && o.orderStatus == '10'" style="color: red; font-size: 15px">
-                              v-if="g.refundAuditResult == '2' && (g.orderStatus = '10' || g.orderStatus == '11')"
+                              已拒绝退款：{{ o.refundFailReason }}
-                              style="color: red; font-size: 15px"
-                            >
-                              已拒绝退款：该产品不支持退货/退款
                             </div>
                           </div>
                         </div>