code-image-backup-public/lilishop-ui
1
0
Fork 0
mirror of https://gitee.com/beijing_hongye_huicheng/lilishop-ui.git synced 2025-12-22 10:55: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

37
seller/src/views/order/receiptManager/receipt.vue
View File

@@ -125,9 +125,13 @@ export default {
tooltip: true,
render: (h, params) => {
if (params.row.receiptStatus == 0) {
return h("div", "未开票");
return h("div", [
h("tag", { props: { color: "volcano" } }, "未开票"),
]);
} else {
return h("div", "已开票");
return h("div", [
h("tag", { props: { color: "green" } }, "未开票"),
]);
}
},
},
@@ -137,22 +141,37 @@ export default {
width: 90,
render: (h, params) => {
if (params.row.orderStatus == "UNPAID") {
return h("div", [h("span", {}, "未付款")]);
return h("div", [
h("tag", { props: { color: "magenta" } }, "未付款"),
]);
} else if (params.row.orderStatus == "PAID") {
return h("div", [h("span", {}, "已付款")]);
return h("div", [
h("tag", { props: { color: "blue" } }, "已付款"),
]);
} else if (params.row.orderStatus == "UNDELIVERED") {
return h("div", [h("span", {}, "待发货")]);
return h("div", [
h("tag", { props: { color: "geekblue" } }, "待发货"),
]);
} else if (params.row.orderStatus == "DELIVERED") {
return h("div", [h("span", {}, "已发货")]);
return h("div", [
h("tag", { props: { color: "cyan" } }, "已发货"),
]);
} else if (params.row.orderStatus == "COMPLETED") {
return h("div", [h("span", {}, "已完成")]);
return h("div", [
h("tag", { props: { color: "green" } }, "已完成"),
]);
} else if (params.row.orderStatus == "TAKE") {
return h("div", [h("span", {}, "待核验")]);
return h("div", [
h("tag", { props: { color: "volcano" } }, "待核验"),
]);
} else if (params.row.orderStatus == "CANCELLED") {
return h("div", [h("span", {}, "已取消")]);
return h("div", [
h("tag", { props: { color: "red" } }, "已取消"),
]);
}
},
},
{
title: "操作",
key: "action",