From 5e14f29ecbbd13c64b01914602268825b5973fe3 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Mon, 26 Aug 2024 09:51:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E5=AE=A2=E4=B8=8B=E5=8D=95=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=98=AF=E5=90=A6=E5=94=AE=E5=B0=BD=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/table/components/table-diancan.vue | 61 ++++++++++----------
 1 file changed, 31 insertions(+), 30 deletions(-)

diff --git a/src/views/table/components/table-diancan.vue b/src/views/table/components/table-diancan.vue
index 338f139..913efde 100644
--- a/src/views/table/components/table-diancan.vue
+++ b/src/views/table/components/table-diancan.vue
@@ -504,10 +504,7 @@
                   <template v-if="layout.sel === 'img-and-text'">
                     <div
                       class="sell-out-svg"
-                      v-if="
-                        item.isPauseSale ||
-                        (item.typeEnum !== 'sku' && item.stockNumber <= 0)
-                      "
+                      v-if="isSellOut(item)"
                     >
                       <svg
                         t="1724234807994"
@@ -552,10 +549,7 @@
                     <template v-if="layout.sel === 'text'">
                       <div class="text-sell-out flex">
                         <svg
-                          v-if="
-                            item.isPauseSale ||
-                            (item.typeEnum !== 'sku' && item.stockNumber <= 0)
-                          "
+                          v-if="isSellOut(item)"
                           t="1724236049267"
                           class="icon"
                           viewBox="0 0 1024 1024"
@@ -591,13 +585,7 @@
                     <div class="stockNumber"></div>
                     <div class="">￥{{ item.lowPrice }}</div>
                     <template v-if="layout.sel === 'default'">
-                      <div
-                        class="flex"
-                        v-if="
-                          item.isPauseSale ||
-                          (item.typeEnum !== 'sku' && item.stockNumber <= 0)
-                        "
-                      >
+                      <div class="flex" v-if="isSellOut(item)">
                         <div class="timeSale">售罄</div>
                       </div>
                     </template>
@@ -1428,10 +1416,17 @@ export default {
     },
   },
   mounted() {
-    this.getGoods();
-    this.getCategory();
+    // this.getGoods();
+    // this.getCategory();
   },
   methods: {
+    //判读单规格商品是否售尽
+    isSellOut(item) {
+      return (
+        item.isPauseSale ||
+        (item.typeEnum !== "sku" && item.specList[0].stockNumber <= 0)
+      );
+    },
     toggleFullScreen() {
       if (!document.fullscreenElement) {
         this.enterFullScreen();
@@ -1729,26 +1724,31 @@ export default {
       const order = this.prveOrder.list[sel];
       const orderMasterId = order.carList[0].masterId;
       //当前订单是否是当前挂单
-      const nowOrderIsPrverOrder =this.isPrverOrder && orderMasterId === this.masterId
+      const nowOrderIsPrverOrder =
+        this.isPrverOrder && orderMasterId === this.masterId;
       if (nowOrderIsPrverOrder) {
-        const res= await  this.$confirm("您正在删除当前购物车订单,是否删除?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        }).catch(err=>{
-          console.log(err)
-        })
-        if(!res){
-          return
+        const res = await this.$confirm(
+          "您正在删除当前购物车订单,是否删除?",
+          "提示",
+          {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          }
+        ).catch((err) => {
+          console.log(err);
+        });
+        if (!res) {
+          return;
         }
       }
       if (isRequest) {
         const res = await $delOrder({
           orderId: order.orderId,
         });
-        if(nowOrderIsPrverOrder){
-          this.note.content=''
-          this.order.list=[]
+        if (nowOrderIsPrverOrder) {
+          this.note.content = "";
+          this.order.list = [];
         }
         this.$notify({
           message: "删除成功",
@@ -2376,6 +2376,7 @@ export default {
       this.masterId = res.masterId;
       this.getCart();
       this.getGoods();
+      this.getCategory();
       // this.getPrveCart();
       this.getCacheOrder();
     },