code-image-backup-public/lilishop-ui
1
0
Fork 0
mirror of https://gitee.com/beijing_hongye_huicheng/lilishop-ui.git synced 2026-02-06 09:05:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

合并master上面的冲突

Browse Source
This commit is contained in:
lemon橪
2021-06-23 18:13:11 +08:00
parent 2391f71d9a 6bc0591418
commit b7dd7f1c3b
35 changed files with 632 additions and 651 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
seller/src/views/promotion/seckill/seckill.vue
View File

@@ -105,13 +105,13 @@ export default {
color = "default";
if (params.row.promotionStatus == "NEW") {
text = "未开始";
color = "default";
color = "geekblue";
} else if (params.row.promotionStatus == "START") {
text = "已开始";
color = "green";
} else if (params.row.promotionStatus == "END") {
text = "已结束";
color = "red";
color = "volcano";
} else if (params.row.promotionStatus == "CLOSE") {
text = "已关闭";
color = "red";