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

Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui

master
mahe 2023-05-09 11:05:49 +08:00
parent 5c3501f08d ad09b38ed5
commit 4a628acd37
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buyer/src/pages/home/userCenter/MoneyManagement.vue
View File

@ -369,6 +369,8 @@ export default {
return h('div', [h('span', {}, '申请中')]); return h('div', [h('span', {}, '申请中')]);
} else if (params.row.applyStatus === 'VIA_AUDITING') { } else if (params.row.applyStatus === 'VIA_AUDITING') {
return h('div', [h('span', {}, '提现成功')]); return h('div', [h('span', {}, '提现成功')]);
} else if (params.row.applyStatus === 'ERROR') {
return h('div', [h('span', {}, '提现失败')]);
} else { } else {
return h('div', [h('span', {}, '审核拒绝')]); return h('div', [h('span', {}, '审核拒绝')]);
} }

4
manager/src/views/member/advance/withdrawApply.vue
View File

@ -165,6 +165,8 @@ export default {
return h("Tag", { props: { color: "green" } }, "审核通过"); return h("Tag", { props: { color: "green" } }, "审核通过");
} else if (params.row.applyStatus == "SUCCESS") { } else if (params.row.applyStatus == "SUCCESS") {
return h("Tag", { props: { color: "blue" } }, "提现成功"); return h("Tag", { props: { color: "blue" } }, "提现成功");
} else if (params.row.applyStatus == "ERROR") {
return h("Tag", { props: { color: "blue" } }, "提现失败");
} else { } else {
return h("Tag", { props: { color: "red" } }, "审核拒绝"); return h("Tag", { props: { color: "red" } }, "审核拒绝");
} }
@ -249,6 +251,8 @@ export default {
return "审核通过(提现成功)"; return "审核通过(提现成功)";
} else if (val === "FAIL_AUDITING") { } else if (val === "FAIL_AUDITING") {
return "审核拒绝"; return "审核拒绝";
} else if (val === "ERROR") {
return "提现失败";
} else { } else {
return "未知状态"; return "未知状态";
} }

5
seller/src/views/promotion/full-discount/full-discount-add.vue
View File

@ -299,11 +299,14 @@ export default {
delete params.promotionGoodsList; delete params.promotionGoodsList;
params.number = -1; params.number = -1;
} else { } else {
let scopeId = [];
params.number = 1; params.number = 1;
params.promotionGoodsList.forEach((e) => { params.promotionGoodsList.forEach((e) => {
e.startTime = params.stratTime; e.startTime = params.startTime;
e.endTime = params.endTime; e.endTime = params.endTime;
scopeId.push(e.skuId);
}); });
params.scopeId = scopeId.toString();
} }
if (params.discountType == "fullMinusFlag") { if (params.discountType == "fullMinusFlag") {
params.fullMinusFlag = true; params.fullMinusFlag = true;