diff --git a/assets/img/goods/skill.png b/assets/img/goods/skill.png new file mode 100644 index 0000000..68a4993 Binary files /dev/null and b/assets/img/goods/skill.png differ 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 @@ 新品 {{ detailData.name }}

+
+ 距结束仅剩 + {{ getSurplus.lefth }} + {{ getSurplus.leftm }} + {{ getSurplus.lefts }} +
售价 - +
即将开始秒杀
- 08 - 08 - 08 + {{ getSurplus.lefth }} + {{ getSurplus.leftm }} + {{ getSurplus.lefts }}
{{ getBeginTime() }}
@@ -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;