zhuce
/
lilishop-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

master
chc 2022-10-28 09:44:47 +08:00
parent c382f015f4 c083a58f30
commit 405bb4a216
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
buyer/src/pages/promotion/seckill.vue
View File

@ -62,7 +62,7 @@
{{ nowHour >= list[currIndex].timeLine ? "立即抢购" : "即将开始" }} {{ nowHour >= list[currIndex].timeLine ? "立即抢购" : "即将开始" }}
</div> </div>
<div <div
v-if="nowHour >= list[currIndex].timeLine" v-if="nowHour >= list[currIndex].timeLine && item.quantity <= item.salesNum"
class="goods-seckill-btn goods-seckill-btn-gray" class="goods-seckill-btn goods-seckill-btn-gray"
> >
已售罄 已售罄
@ -209,6 +209,8 @@ export default {
line-height: 35px; line-height: 35px;
font-size: 14px; font-size: 14px;
background-color: $theme_color; background-color: $theme_color;
margin-bottom: 1px;
margin-right: 1px;
} }
.goods-seckill-btn-gray { .goods-seckill-btn-gray {
background-color: #666; background-color: #666;
@ -256,10 +258,10 @@ export default {
} }
} }
.goods-show-info1 { .goods-show-info1 {
width: 275px; width: 290px;
padding: 6px; padding: 6px;
margin: 10px 0px; margin: 10px 0px;
margin-left: 5px; margin-left: 8px;
position: relative; position: relative;
border: 1px solid #fff; border: 1px solid #fff;
cursor: pointer; cursor: pointer;

1
manager/src/views/page-decoration/wap/decorate.vue
View File

@ -621,6 +621,7 @@ export default {
}, },
// 回调选择的链接 // 回调选择的链接
selectedLink(val) { selectedLink(val) {
this.selectedLinks.zoneInfo = []
delete val.selected; delete val.selected;
delete val.intro; delete val.intro;
delete val.mobileIntro; delete val.mobileIntro;