From 0933f1942e9d26df3b11694c00e6fce8b1a59787 Mon Sep 17 00:00:00 2001
From: paulGao <paulgao0831@gmail.com>
Date: Fri, 9 Sep 2022 14:30:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E5=A4=8D=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E7=AB=AF=E4=B8=8B=E6=9E=B6=E5=95=86=E5=93=81=E4=BC=A0?=
 =?UTF-8?q?=E9=80=92undefined=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E7=A7=92=E6=9D=80=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/src/pages/promotion/seckill.vue        | 5 +++--
 manager/src/libs/axios.js                    | 1 -
 manager/src/views/goods/goods-info/goods.vue | 4 +++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/buyer/src/pages/promotion/seckill.vue b/buyer/src/pages/promotion/seckill.vue
index 24ebf182..38c3aaf6 100644
--- a/buyer/src/pages/promotion/seckill.vue
+++ b/buyer/src/pages/promotion/seckill.vue
@@ -42,9 +42,10 @@
         <div class="goods-show-detail">
           <span>{{ item.goodsName }}</span>
         </div>
-        <div class="goods-seckill-btn" :class="{'goods-seckill-btn-gray' : nowHour < list[currIndex].timeLine}">{{nowHour >= list[currIndex].timeLine ? '立即抢购' : '即将开始'}}</div>
+        <div v-if="item.quantity" class="goods-seckill-btn" :class="{'goods-seckill-btn-gray' : nowHour < list[currIndex].timeLine}">{{nowHour >= list[currIndex].timeLine ? '立即抢购' : '即将开始'}}</div>
+        <div v-else-if="!item.quantity || item.quantity <= item.salesNum" class="goods-seckill-btn goods-seckill-btn-gray">已售罄</div>
         <div class="goods-show-num">
-          已售<Progress style="width:110px"  class="ml_10" :percent="Math.ceil(item.salesNum/(item.quantity+item.salesNum)*100)" />
+          已售<Progress style="width:110px"  class="ml_10" :percent="item.quantity ? Math.ceil(item.salesNum/(item.quantity+item.salesNum)*100) : 100" />
         </div>
         <div class="goods-show-seller">
           <span>{{ item.storeName }}</span>
diff --git a/manager/src/libs/axios.js b/manager/src/libs/axios.js
index d4a9c02b..e49d796c 100644
--- a/manager/src/libs/axios.js
+++ b/manager/src/libs/axios.js
@@ -119,7 +119,6 @@ service.interceptors.response.use(
         }
       } else {
         // 其他错误处理
-        console.log(error.response.data);
         Message.error(error.response.data.message);
       }
     }
diff --git a/manager/src/views/goods/goods-info/goods.vue b/manager/src/views/goods/goods-info/goods.vue
index 73473a05..4638ff34 100644
--- a/manager/src/views/goods/goods-info/goods.vue
+++ b/manager/src/views/goods/goods-info/goods.vue
@@ -386,8 +386,10 @@ export default {
     // 编辑
     edit(v) {
       this.id = v.id;
-      if (v.underMessage != "{}") {
+      if (v.underMessage) {
         this.underForm.reason = v.underMessage;
+      } else {
+        this.underForm.reason = "";
       }
       this.modalVisible = true;
     },