From a78374910fcf077ffe9d8da11b6f9f7161043e49 Mon Sep 17 00:00:00 2001 From: Chopper711 Date: Sat, 6 May 2023 16:23:27 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E5=85=BC=E5=AE=B9=E6=8F=90=E7=8E=B0?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E5=89=8D=E7=AB=AF=E7=9A=84=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manager/src/views/member/advance/withdrawApply.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/manager/src/views/member/advance/withdrawApply.vue b/manager/src/views/member/advance/withdrawApply.vue index 891e7832..e7fc202c 100644 --- a/manager/src/views/member/advance/withdrawApply.vue +++ b/manager/src/views/member/advance/withdrawApply.vue @@ -165,6 +165,8 @@ export default { return h("Tag", { props: { color: "green" } }, "审核通过"); } else if (params.row.applyStatus == "SUCCESS") { return h("Tag", { props: { color: "blue" } }, "提现成功"); + } else if (params.row.applyStatus == "ERROR") { + return h("Tag", { props: { color: "blue" } }, "提现失败"); } else { return h("Tag", { props: { color: "red" } }, "审核拒绝"); } From 8ad79b8728fd6d9cbf0077ef0ef415cb1576c496 Mon Sep 17 00:00:00 2001 From: Chopper711 Date: Sat, 6 May 2023 16:23:29 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E5=85=BC=E5=AE=B9=E6=8F=90=E7=8E=B0?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E5=89=8D=E7=AB=AF=E7=9A=84=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manager/src/views/member/advance/withdrawApply.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/manager/src/views/member/advance/withdrawApply.vue b/manager/src/views/member/advance/withdrawApply.vue index e7fc202c..38ba8262 100644 --- a/manager/src/views/member/advance/withdrawApply.vue +++ b/manager/src/views/member/advance/withdrawApply.vue @@ -251,6 +251,8 @@ export default { return "审核通过(提现成功)"; } else if (val === "FAIL_AUDITING") { return "审核拒绝"; + } else if (val === "ERROR") { + return "提现失败"; } else { return "未知状态"; } From 056386e8e9db660bf8647d62d265b5f0de47c96c Mon Sep 17 00:00:00 2001 From: Chopper711 Date: Sat, 6 May 2023 16:34:33 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=E7=94=A8=E6=88=B7=E7=AB=AF=E6=8F=90?= =?UTF-8?q?=E7=8E=B0=E7=8A=B6=E6=80=81=E5=B1=95=E7=A4=BA=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer/src/pages/home/userCenter/MoneyManagement.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/buyer/src/pages/home/userCenter/MoneyManagement.vue b/buyer/src/pages/home/userCenter/MoneyManagement.vue index cf709af4..2d5ee116 100644 --- a/buyer/src/pages/home/userCenter/MoneyManagement.vue +++ b/buyer/src/pages/home/userCenter/MoneyManagement.vue @@ -369,6 +369,8 @@ export default { return h('div', [h('span', {}, '申请中')]); } else if (params.row.applyStatus === 'VIA_AUDITING') { return h('div', [h('span', {}, '提现成功')]); + } else if (params.row.applyStatus === 'ERROR') { + return h('div', [h('span', {}, '提现失败')]); } else { return h('div', [h('span', {}, '审核拒绝')]); } From c60a54b8f9c5b231cd23fcc6c71ca0b3c72c4ee8 Mon Sep 17 00:00:00 2001 From: misworga831 Date: Mon, 8 May 2023 18:41:56 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=BB=A1=E5=87=8F?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E6=B2=A1=E6=9C=89=E4=BC=A0=E9=80=92=E8=8C=83?= =?UTF-8?q?=E5=9B=B4=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/promotion/full-discount/full-discount-add.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/seller/src/views/promotion/full-discount/full-discount-add.vue b/seller/src/views/promotion/full-discount/full-discount-add.vue index 134ef7d4..520a03a4 100644 --- a/seller/src/views/promotion/full-discount/full-discount-add.vue +++ b/seller/src/views/promotion/full-discount/full-discount-add.vue @@ -447,11 +447,14 @@ export default { delete params.promotionGoodsList; params.number = -1; } else { + let scopeId = []; params.number = 1; params.promotionGoodsList.forEach((e) => { - e.startTime = params.stratTime; + e.startTime = params.startTime; e.endTime = params.endTime; + scopeId.push(e.skuId); }); + params.scopeId = scopeId.toString(); } if (params.discountType == "fullMinusFlag") { params.fullMinusFlag = true;