From 82772ab10e27890db53d729d1eeabfe0f7ed5059 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=BE=81?= <zhangz@163.com>
Date: Wed, 11 May 2022 22:16:00 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=E5=AE=8C=E6=88=90=E4=B8=BA=E4=BD=A0?=
 =?UTF-8?q?=E6=8E=A8=E8=8D=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/BsAddress.vue        | 4 ++--
 pages/account/index/address.vue | 4 ++--
 pages/goods/detail/_id.vue      | 8 +++++++-
 pages/goods/list/index.vue      | 3 ---
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/components/BsAddress.vue b/components/BsAddress.vue
index 6704e87..94d3db5 100644
--- a/components/BsAddress.vue
+++ b/components/BsAddress.vue
@@ -10,9 +10,9 @@
         <div class="address__msg-line flex flex-middle">
           <span class="address__msg-line--type">收货地址:</span>
           <span class="address__msg-line--txt">{{
-            curAddressListItem.area +
-            curAddressListItem.city +
             curAddressListItem.province +
+            curAddressListItem.city +
+            curAddressListItem.area +
             curAddressListItem.detailAddress
           }}</span>
         </div>
diff --git a/pages/account/index/address.vue b/pages/account/index/address.vue
index ada90e8..97b0987 100644
--- a/pages/account/index/address.vue
+++ b/pages/account/index/address.vue
@@ -23,9 +23,9 @@
       <el-table-column label="收货地址" width="430px">
         <template slot-scope="scope">
           {{
-            scope.row.area +
-            scope.row.city +
             scope.row.province +
+            scope.row.city +
+            scope.row.area +
             scope.row.detailAddress
           }}
         </template>
diff --git a/pages/goods/detail/_id.vue b/pages/goods/detail/_id.vue
index 4544d80..07c42b9 100644
--- a/pages/goods/detail/_id.vue
+++ b/pages/goods/detail/_id.vue
@@ -94,6 +94,12 @@
               >
             </div>
           </div>
+          <div class="main__details-option--line flex flex-middle">
+            <span class="line-txt">数量</span>
+            <div class="line-btns">
+              <el-input-number v-model="curBuyNum" :min="1"></el-input-number>
+            </div>
+          </div>
         </div>
         <div class="main__details-pay">
           <UiButton type="yellow_line">加入购物车</UiButton>
@@ -444,7 +450,7 @@ export default {
             border-color: #ccc;
           }
           .attr-item__active {
-            border: 1px solid #FF512B;
+            border: 1px solid #ff512b;
           }
           .attr-item__disabled {
             color: #999999;
diff --git a/pages/goods/list/index.vue b/pages/goods/list/index.vue
index df3a2af..74be321 100644
--- a/pages/goods/list/index.vue
+++ b/pages/goods/list/index.vue
@@ -54,7 +54,6 @@
           :item="item"
           v-for="item in listData"
           :key="item.id"
-          :isRecommend="isRecommend"
         ></UiGoodsItem>
       </div>
       <el-pagination
@@ -103,7 +102,6 @@ export default {
   components: { Sort, UiGoodsItem },
   data() {
     return {
-      isRecommend: false,
       navActive: 0,
       levelActive: 0,
       listData: [],
@@ -132,7 +130,6 @@ export default {
       this.levelType = this.$route.query.levelType || "";
       this.levelId = this.$route.query.id || "";
       this.levelType == 2 ? (this.params.categoryId = this.levelId) : "";
-      this.isRecommend = this.levelId == "recommend" ? true : false;
       this.getRecommendedGoodsList();
       if (this.levelType == 1) {
         this.getCategoryTwoAndGoods();

From bbd5d7b3083bb367c75d075304eb14e878f57664 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=BE=81?= <zhangz@163.com>
Date: Thu, 12 May 2022 17:42:40 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feat:=E5=AE=8C=E6=88=90=E4=B8=BA=E4=BD=A0?=
 =?UTF-8?q?=E7=AB=9E=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/img/goods/tips.png       | Bin 0 -> 553 bytes
 components/UiChosen.vue         |  81 +++++++++++++
 layouts/module/header/index.vue |   4 -
 pages/goods/detail/_id.vue      | 195 ++++++++++++++++++++++++++++++--
 pages/goods/list/index.vue      |  66 +----------
 5 files changed, 270 insertions(+), 76 deletions(-)
 create mode 100644 assets/img/goods/tips.png
 create mode 100644 components/UiChosen.vue

diff --git a/assets/img/goods/tips.png b/assets/img/goods/tips.png
new file mode 100644
index 0000000000000000000000000000000000000000..65d5a0cffcb2af04c3953fae813e7313621d8f74
GIT binary patch
literal 553
zcmV+^0@nSBP)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00001b5ch_0Itp)
z=>Px$<4Ht8R5(wql(CBwK@`TnmzaRCf~CC&Y9W%%+a_AvqMavbcVgic-XGv!Vk>B&
zpm?2vT8V554Z^%^usXrBw-j7Zc1@nVb7tKfOM>7u12b=a^S<}y8$!#-^ZfE+vDgN%
z3E-3u`3hj%>2&tuIDUKd7&RB1b7zR?z6Z435!S{4?lAM0uuy|$v)RS@eEtf+Nmczx
zL{9*`2Jp!Tp9OFgzz%?80KRp*-L1i3@ZR<hK|YfY9wJp$-5iZZ2ev07r)>_mPbQO%
zUa$9zh}d9dStb^H2ojOZ<fy6?MUkdyT7;BE<huu*2y0oEMNt%G9yVs?l$>){i0F;U
zsjBLH$fN;M4_d0HW!CTa_f4j%rX(T{tZ)DxGV|`y3X4c9$SbMO8t5~C4FETo`Ncni
zt^;@u;J`pug9yMmW)2;yd22GVPMW;pzk=3DyX}kpxJCAow3Wrq^ZbGV;yC`;0{UC*
zb?tY~{V+h1B*&W||1kH7=ui9CJ;>>Fde35p!{ObP57IXM<8r|wM6}&BWHS@9jH>Rn
zTEu5{3BXGa`$a^LRMkveo0f>SRCUMXn9l%QW9E0YX~T^^Gb^C|L#xKPEX&=dotFF)
rPCDl{iRf0_$EK=JlO(bKXleWgU*#H(Wobs#00000NkvXXu0mjfTc!sW

literal 0
HcmV?d00001

diff --git a/components/UiChosen.vue b/components/UiChosen.vue
new file mode 100644
index 0000000..46e8f5f
--- /dev/null
+++ b/components/UiChosen.vue
@@ -0,0 +1,81 @@
+<template>
+  <div class="chosen">
+    <div class="chosen-title flex flex-between flex-middle">
+      <h3 class="chosen-title--txt">为你精选</h3>
+      <div class="chosen-title--btn flex" @click="getRecommendedGoodsList()">
+        <img src="@/assets/img/goods/each.png" alt="切换推荐" />
+        <span>换一组</span>
+      </div>
+    </div>
+    <div class="chosen-list">
+      <UiGoodsItem
+        :item="item"
+        v-for="item in recommendedData"
+        :key="item.id"
+      ></UiGoodsItem>
+    </div>
+  </div>
+</template>
+<script>
+import { ApiGetRecommendedGoodsList } from "@/plugins/api/goods";
+import UiGoodsItem from "@/components/UiGoodsItem.vue";
+export default {
+  components: { UiGoodsItem },
+  data() {
+    return {
+      recommendedData: [],
+    };
+  },
+  created() {
+    this.getRecommendedGoodsList();
+  },
+  methods: {
+    async getRecommendedGoodsList() {
+      let vm = this;
+      let res = await ApiGetRecommendedGoodsList();
+      vm.recommendedData = res.result;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.chosen {
+  width: 100%;
+  padding: 30px 0 40px;
+  background: #f8f8f8;
+
+  &-title {
+    @include layout-box;
+    &--txt {
+      font-size: 24px;
+      font-family: Microsoft YaHei-Bold, Microsoft YaHei;
+      font-weight: bold;
+      color: #333333;
+    }
+    &--btn {
+      width: 140px;
+      cursor: pointer;
+      img {
+        width: 27px;
+        height: 27px;
+        margin-right: 5px;
+      }
+      span {
+        font-size: 18px;
+        font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+        font-weight: 400;
+        color: #999999;
+      }
+    }
+  }
+  &-list {
+    @include layout-box;
+    padding-top: 40px;
+    display: grid;
+    grid-template-columns: repeat(auto-fill, 232px);
+    justify-content: space-between;
+    grid-row-gap: 10px;
+  }
+}
+</style>
diff --git a/layouts/module/header/index.vue b/layouts/module/header/index.vue
index 948e686..e5fc3ad 100644
--- a/layouts/module/header/index.vue
+++ b/layouts/module/header/index.vue
@@ -199,10 +199,6 @@ export default {
       tabPath: "/",
       tabList: [
         { label: "首页", value: "/" },
-        {
-          label: "爆款推荐",
-          value: `/goods/list?id=recommend`,
-        },
         {
           label: "开发书籍",
           value: `/goods/list?id=6&levelType=${CATEGROY_LEVEL.ONE}`,
diff --git a/pages/goods/detail/_id.vue b/pages/goods/detail/_id.vue
index 07c42b9..b775148 100644
--- a/pages/goods/detail/_id.vue
+++ b/pages/goods/detail/_id.vue
@@ -11,7 +11,7 @@
         Java从入门到项目实战
       </p>
     </nav>
-    <main class="main flex">
+    <main class="main flex" v-if="detailData.isEnable">
       <aside class="main__preview">
         <img
           class="main__preview-big"
@@ -56,9 +56,24 @@
           {{ detailData.name }}
         </p>
         <div class="main__details-msg">
-          <div class="main__details-msg--price flex">
+          <div class="main__details-msg--price flex flex-middle">
             <span class="msg-txt">售价</span>
             <UiMoney :money="detailData.startingPrice"></UiMoney>
+            <div
+              v-if="
+                detailData.productActivityVO.isActivity &&
+                !detailData.productActivityVO.isStartActivity
+              "
+              class="main__details-msg--skill flex flex-column flex-bottom"
+            >
+              <span class="skill-txt">即将开始秒杀</span>
+              <div class="skill-2" v-if="isToday()">
+                <span>08</span>
+                <span>08</span>
+                <span>08</span>
+              </div>
+              <span class="skill-1" v-else>{{ getBeginTime() }}</span>
+            </div>
           </div>
           <div class="hr"></div>
           <div class="main__details-msg--service flex flex-middle">
@@ -73,7 +88,7 @@
             />
           </div>
         </div>
-        <div class="main__details-option">
+        <div class="main__details-option" v-if="skuData.stock">
           <div
             class="main__details-option--line flex flex-middle"
             v-for="(item, index) in detailData.attributeGroupList"
@@ -101,6 +116,10 @@
             </div>
           </div>
         </div>
+        <div class="main__details-none flex flex-middle" v-else>
+          <img src="@/assets/img/goods/tips.png" alt="" />
+          <span>此商品暂无库存啦~看看其他的吧</span>
+        </div>
         <div class="main__details-pay">
           <UiButton type="yellow_line">加入购物车</UiButton>
           <UiButton type="yellow_panel" @click="buyNow">立即购买</UiButton>
@@ -108,7 +127,11 @@
       </article>
     </main>
 
-    <section class="section flex">
+    <main v-else class="main">
+      <img class="main-none-img" src="@/assets/img/goods/none.png" alt="" />
+      <p class="main-none-txt">商品已下架啦，去逛逛别的吧~</p>
+    </main>
+    <section class="section flex" v-if="detailData.isEnable">
       <div class="section-recommend">
         <p class="section-title">看了又看</p>
         <UiGoodsItem
@@ -119,22 +142,32 @@
       </div>
       <div class="section-details">
         <p class="section-title">商品详情</p>
-        <div class="rich" v-html="detailData.detail"></div>
+        <div
+          class="rich"
+          v-html="detailData.detail"
+          v-if="detailData.detail"
+        ></div>
+        <div class="section-details--none" v-else>
+          <img src="@/assets/img/goods/none.png" alt="" />
+          <p>暂无详情</p>
+        </div>
       </div>
     </section>
+    <UiChosen v-else></UiChosen>
   </div>
 </template>
 <script>
 import UiMoney from "@/components/UiMoney.vue";
 import UiButton from "@/components/UiButton.vue";
 import UiGoodsItem from "@/components/UiGoodsItem.vue";
+import UiChosen from "@/components/UiChosen.vue";
 import {
   ApiGetGoodsDetail,
   ApiGetGoodsSkus,
   ApiGetRecommendedGoodsList,
 } from "@/plugins/api/goods";
 export default {
-  componetns: { UiMoney, UiButton, UiGoodsItem },
+  componetns: { UiMoney, UiButton, UiGoodsItem, UiChosen },
   data() {
     return {
       curBuyNum: 1,
@@ -142,8 +175,11 @@ export default {
       recommendedData: [],
       skuData: {},
       detailData: {
+        isEnable: false,
         pictureList: [],
+        productActivityVO: {},
       },
+      surplus: {},
     };
   },
   async created() {
@@ -155,9 +191,6 @@ export default {
     vm.detailData = res1.result;
     vm.skuData = res2.result;
     vm.recommendedData = res3.result;
-    console.log(`res1`, res1.result);
-    console.log(`res2`, res2.result);
-    console.log(`res3`, res3.result);
   },
   computed: {
     /**
@@ -191,6 +224,68 @@ export default {
     },
   },
   methods: {
+    /* 获取倒计时 */
+    getSurplus(startTime, endTime) {
+      let nowtime = new Date(startTime), //获取当前时间
+        endtime = new Date(endTime); //定义结束时间
+      let leftObj = {};
+      leftObj["lefttime"] = endtime.getTime() - nowtime.getTime(); //距离结束时间的毫秒数
+      leftObj["leftd"] = Math.floor(
+        leftObj["lefttime"] / (1000 * 60 * 60 * 24)
+      ); //计算天数
+      leftObj["lefth"] = Math.floor(
+        (leftObj["lefttime"] / (1000 * 60 * 60)) % 24
+      ); //计算小时数
+      leftObj["leftm"] = Math.floor((leftObj["lefttime"] / (1000 * 60)) % 60); //计算分钟数
+      leftObj["lefts"] = Math.floor((leftObj["lefttime"] / 1000) % 60); //计算秒数
+      return leftObj;
+    },
+    setSurplus() {
+      let vm = this;
+      let startTime = new Date(
+        vm.detailData.productActivityVO.currentTime
+      ).getTime();
+      let endTime = new Date(
+        vm.detailData.productActivityVO.activityEndTime
+      ).getTime();
+      vm.surplus = getSurplus(startTime, endTime);
+      if (vm.timer) {
+        return false;
+      }
+      vm.timer = setInterval(() => {
+        vm.startTime += 1000;
+        vm.surplus = getSurplus(vm.startTime, vm.endTime);
+        if (vm.surplus.lefttime <= 0) {
+          clearInterval(vm.timer);
+          location.reload();
+        }
+      }, 1000);
+    },
+    isToday() {
+      let vm = this;
+      let begin = new Date(
+        vm.detailData.productActivityVO.activityStartTime
+      ).getTime();
+      let now = new Date(vm.detailData.productActivityVO.currentTime).getTime();
+      if (new Date(begin).toDateString() === new Date(now).toDateString()) {
+        return true;
+      } else if (new Date(begin) < new Date()) {
+        return false;
+      }
+    },
+    getBeginTime() {
+      let vm = this;
+      let begin = new Date(
+        vm.detailData.productActivityVO.activityStartTime
+      ).getTime();
+      let timestr = new Date(begin);
+      let month = timestr.getMonth() + 1;
+      let date = timestr.getDate();
+      let hour = timestr.getHours();
+      let minute = timestr.getMinutes();
+      let datetime = `${month}月${date}日 ${hour}:${minute} 开始`;
+      return datetime;
+    },
     onActiveImg(i) {
       this.activeImg = i;
     },
@@ -417,6 +512,34 @@ export default {
       &--price {
         padding-bottom: 30px;
       }
+
+      &--skill {
+        margin-left: auto;
+
+        .skill-1 {
+          font-size: 16px;
+          font-family: PingFang SC-常规体, PingFang SC;
+          font-weight: normal;
+          color: #e83710;
+        }
+
+        .skill-2 {
+          margin-top: 6px;
+          span {
+            display: inline-block;
+            width: 22px;
+            height: 22px;
+            background: #e83710;
+            border-radius: 2px;
+            font-size: 14px;
+            font-family: PingFang SC-常规体, PingFang SC;
+            font-weight: normal;
+            color: #ffffff;
+            text-align: center;
+            line-height: 22px;
+          }
+        }
+      }
       .hr {
         width: 673px;
         height: 1px;
@@ -460,6 +583,27 @@ export default {
       }
     }
 
+    &-none {
+      width: 713px;
+      height: 40px;
+      background: #f3f3f3;
+      margin-top: 20px;
+      padding: 0 20px;
+
+      img {
+        width: 18px;
+        height: 18px;
+        margin-right: 12px;
+      }
+
+      span {
+        font-size: 14px;
+        font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+        font-weight: 400;
+        color: #666666;
+      }
+    }
+
     &-pay {
       margin-top: 40px;
       button {
@@ -476,6 +620,21 @@ export default {
       }
     }
   }
+  &-none-img {
+    display: block;
+    width: 228px;
+    height: 144px;
+    margin: 60px auto 20px;
+  }
+  &-none-txt {
+    width: 100%;
+    text-align: center;
+    font-size: 14px;
+    font-family: PingFang SC-常规体, PingFang SC;
+    font-weight: normal;
+    color: #999999;
+    margin-bottom: 50px;
+  }
 }
 .section {
   width: 1200px;
@@ -490,6 +649,24 @@ export default {
   }
   &-details {
     width: 960px;
+
+    &--none {
+      img {
+        display: block;
+        width: 228px;
+        height: 144px;
+        margin: 133px auto 20px;
+      }
+
+      p {
+        width: 100%;
+        text-align: center;
+        font-size: 14px;
+        font-family: PingFang SC-常规体, PingFang SC;
+        font-weight: normal;
+        color: #999999;
+      }
+    }
   }
   &-title {
     width: 100%;
diff --git a/pages/goods/list/index.vue b/pages/goods/list/index.vue
index 74be321..835d348 100644
--- a/pages/goods/list/index.vue
+++ b/pages/goods/list/index.vue
@@ -70,23 +70,7 @@
       <img class="main-none-img" src="@/assets/img/goods/none.png" alt="" />
       <p class="main-none-txt">没有搜到你想要的商品哦，换个关键词试试</p>
     </main>
-    <section class="section">
-      <div class="section-title flex flex-between flex-middle">
-        <h3 class="section-title--txt">为你精选</h3>
-        <div class="section-title--btn flex" @click="getRecommendedGoodsList()">
-          <img src="@/assets/img/goods/each.png" alt="切换推荐" />
-          <span>换一组</span>
-        </div>
-      </div>
-
-      <div class="section-list">
-        <UiGoodsItem
-          :item="item"
-          v-for="item in recommendedData"
-          :key="item.id"
-        ></UiGoodsItem>
-      </div>
-    </section>
+    <UiChosen></UiChosen>
   </div>
 </template>
 <script>
@@ -94,12 +78,12 @@ import {
   ApiGetGoodsList,
   ApiGetCategoryOneList,
   ApiGetCategoryTwoAndGoods,
-  ApiGetRecommendedGoodsList,
 } from "@/plugins/api/goods";
 import Sort from "./module/SortItem.vue";
 import UiGoodsItem from "@/components/UiGoodsItem.vue";
+import UiChosen from '@/components/UiChosen.vue';
 export default {
-  components: { Sort, UiGoodsItem },
+  components: { Sort, UiGoodsItem,UiChosen },
   data() {
     return {
       navActive: 0,
@@ -109,7 +93,6 @@ export default {
       // 0:综合,1:desc,2:asc,3:上新
       sortType: 0,
       categoryOneList: [],
-      recommendedData: [],
       levelType: "",
       levelId: "",
       params: {
@@ -130,18 +113,12 @@ export default {
       this.levelType = this.$route.query.levelType || "";
       this.levelId = this.$route.query.id || "";
       this.levelType == 2 ? (this.params.categoryId = this.levelId) : "";
-      this.getRecommendedGoodsList();
       if (this.levelType == 1) {
         this.getCategoryTwoAndGoods();
       } else {
         this.getGoodsListData();
       }
     },
-    async getRecommendedGoodsList() {
-      let vm = this;
-      let res = await ApiGetRecommendedGoodsList();
-      vm.recommendedData = res.result;
-    },
     async getCategoryOneList() {
       let res = await ApiGetCategoryOneList();
       this.categoryOneList = res.result;
@@ -309,42 +286,5 @@ export default {
     color: #999999;
   }
 }
-.section {
-  width: 100%;
-  padding: 30px 0 40px;
-  background: #f8f8f8;
 
-  &-title {
-    @include layout-box;
-    &--txt {
-      font-size: 24px;
-      font-family: Microsoft YaHei-Bold, Microsoft YaHei;
-      font-weight: bold;
-      color: #333333;
-    }
-    &--btn {
-      width: 140px;
-      cursor: pointer;
-      img {
-        width: 27px;
-        height: 27px;
-        margin-right: 5px;
-      }
-      span {
-        font-size: 18px;
-        font-family: Microsoft YaHei-Regular, Microsoft YaHei;
-        font-weight: 400;
-        color: #999999;
-      }
-    }
-  }
-  &-list {
-    @include layout-box;
-    padding-top: 40px;
-    display: grid;
-    grid-template-columns: repeat(auto-fill, 232px);
-    justify-content: space-between;
-    grid-row-gap: 10px;
-  }
-}
 </style>

From a6116c717c0238cf5ebc39add920ad7d6de95953 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=BE=81?= <zhangz@163.com>
Date: Thu, 12 May 2022 18:42:31 +0800
Subject: [PATCH 3/3] =?UTF-8?q?feat:=E5=AE=8C=E6=88=90=E7=A7=92=E6=9D=80?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/img/goods/skill.png | Bin 0 -> 3493 bytes
 pages/goods/detail/_id.vue |  77 +++++++++++++++++++++++++++++++------
 2 files changed, 66 insertions(+), 11 deletions(-)
 create mode 100644 assets/img/goods/skill.png

diff --git a/assets/img/goods/skill.png b/assets/img/goods/skill.png
new file mode 100644
index 0000000000000000000000000000000000000000..68a49934f6ac3968fb4f97a3c98535c59fecc88f
GIT binary patch
literal 3493
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
I)3y!&KXEE`#sB~S

literal 0
HcmV?d00001

diff --git a/pages/goods/detail/_id.vue b/pages/goods/detail/_id.vue
index b775148..0701396 100644
--- a/pages/goods/detail/_id.vue
+++ b/pages/goods/detail/_id.vue
@@ -55,10 +55,25 @@
           <span class="main__details-title--label">新品</span>
           {{ detailData.name }}
         </p>
+        <div
+          v-if="detailData.productActivityVO.isStartActivity"
+          class="main__details-skill flex flex-right flex-middle"
+        >
+          距结束仅剩
+          <span>{{ getSurplus.lefth }}</span>
+          <span>{{ getSurplus.leftm }}</span>
+          <span>{{ getSurplus.lefts }}</span>
+        </div>
         <div class="main__details-msg">
           <div class="main__details-msg--price flex flex-middle">
             <span class="msg-txt">售价</span>
-            <UiMoney :money="detailData.startingPrice"></UiMoney>
+            <UiMoney
+              :money="
+                detailData.productActivityVO.isStartActivity
+                  ? detailData.productActivityVO.activityPrice
+                  : detailData.startingPrice
+              "
+            ></UiMoney>
             <div
               v-if="
                 detailData.productActivityVO.isActivity &&
@@ -68,9 +83,9 @@
             >
               <span class="skill-txt">即将开始秒杀</span>
               <div class="skill-2" v-if="isToday()">
-                <span>08</span>
-                <span>08</span>
-                <span>08</span>
+                <span>{{ getSurplus.lefth }}</span>
+                <span>{{ getSurplus.leftm }}</span>
+                <span>{{ getSurplus.lefts }}</span>
               </div>
               <span class="skill-1" v-else>{{ getBeginTime() }}</span>
             </div>
@@ -191,6 +206,27 @@ export default {
     vm.detailData = res1.result;
     vm.skuData = res2.result;
     vm.recommendedData = res3.result;
+    if (
+      vm.detailData.productActivityVO.isActivity &&
+      !vm.detailData.productActivityVO.isStartActivity &&
+      vm.isToday()
+    ) {
+      let startTime = new Date(
+        vm.detailData.productActivityVO.currentTime
+      ).getTime();
+      let endTime = new Date(
+        vm.detailData.productActivityVO.activityStartTime
+      ).getTime();
+      vm.setSurplus(startTime, endTime);
+    } else if (vm.detailData.productActivityVO.isStartActivity) {
+      let startTime = new Date(
+        vm.detailData.productActivityVO.currentTime
+      ).getTime();
+      let endTime = new Date(
+        vm.detailData.productActivityVO.activityEndTime
+      ).getTime();
+      vm.setSurplus(startTime, endTime);
+    }
   },
   computed: {
     /**
@@ -240,14 +276,8 @@ export default {
       leftObj["lefts"] = Math.floor((leftObj["lefttime"] / 1000) % 60); //计算秒数
       return leftObj;
     },
-    setSurplus() {
+    setSurplus(startTime, endTime) {
       let vm = this;
-      let startTime = new Date(
-        vm.detailData.productActivityVO.currentTime
-      ).getTime();
-      let endTime = new Date(
-        vm.detailData.productActivityVO.activityEndTime
-      ).getTime();
       vm.surplus = getSurplus(startTime, endTime);
       if (vm.timer) {
         return false;
@@ -485,6 +515,31 @@ export default {
       }
     }
 
+    &-skill {
+      width: 100%;
+      height: 32px;
+      background: url(@/assets/img/goods/skill.png) no-repeat;
+      background-size: contain;
+      padding: 0 20px;
+      font-size: 14px;
+      font-family: PingFang SC-常规体, PingFang SC;
+      font-weight: normal;
+      color: #ffffff;
+      span {
+        width: 22px;
+        height: 22px;
+        background: #e83710;
+        border-radius: 2px;
+        margin-left: 10px;
+        font-size: 14px;
+        font-family: PingFang SC-常规体, PingFang SC;
+        font-weight: normal;
+        color: #ffffff;
+        line-height: 22px;
+        text-align: center;
+      }
+    }
+
     &-msg {
       width: 714px;
       height: 127px;