From f47ee8fe5836090b1c53ff4c886ba09d5aa02984 Mon Sep 17 00:00:00 2001 From: wangsongsole Date: Mon, 13 Jun 2022 16:41:38 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E3=80=90=E5=85=91?= =?UTF-8?q?=E6=8D=A2=E7=A0=81=E6=89=B9=E6=AC=A1=E3=80=91=E5=9C=A8=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E5=92=8C=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E5=90=8E=E7=AB=AF=E8=BF=94=E5=9B=9E=E7=9A=84?= =?UTF-8?q?channel=E4=B8=BA1=EF=BC=8C=E5=BA=94=E8=AF=A5=E6=98=AF=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E5=AE=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/exchangecode/add/add.js | 2 +- src/pages/exchangecode/edit/edit.js | 2 +- src/pages/plan/add/step2.js | 2 +- src/pages/plan/key/edit.js | 5 +++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/pages/exchangecode/add/add.js b/src/pages/exchangecode/add/add.js index d41c9a1e..9224a681 100644 --- a/src/pages/exchangecode/add/add.js +++ b/src/pages/exchangecode/add/add.js @@ -450,7 +450,7 @@ export default class acclist extends React.Component { newObj.only = item.channel_activity_id //批次号 newObj.type = 2 //类型 newObj.checked = item?.checked - newObj.upstream = item.channel === '1' ? '支付宝' : '微信' //上游 + newObj.upstream = String(item.channel) === '1' ? '支付宝' : '微信' //上游 newObj.edit = 'edit' newObj.effectDate = item.effectDate ? item.effectDate diff --git a/src/pages/exchangecode/edit/edit.js b/src/pages/exchangecode/edit/edit.js index 60d6f4cd..d10d30f2 100644 --- a/src/pages/exchangecode/edit/edit.js +++ b/src/pages/exchangecode/edit/edit.js @@ -710,7 +710,7 @@ export default class exchangedit extends React.Component { newObj.only = item.channel_activity_id //批次号 newObj.type = 2 //类型 newObj.checked = item?.checked - newObj.upstream = item.channel === '1' ? '支付宝' : '微信' //上游 + newObj.upstream = String(item.channel) === '1' ? '支付宝' : '微信' //上游 newObj.edit = 'edit' newObj.effectDate = item.effectDate ? item.effectDate diff --git a/src/pages/plan/add/step2.js b/src/pages/plan/add/step2.js index e1514e76..10b659ff 100644 --- a/src/pages/plan/add/step2.js +++ b/src/pages/plan/add/step2.js @@ -345,7 +345,7 @@ export default class acclist extends React.Component { newObj.only = item.channel_activity_id //批次号 newObj.type = 2 //类型 newObj.checked = item?.checked - newObj.upstream = item.channel === '1' ? '支付宝' : '微信' //上游 + newObj.upstream = String(item.channel) === '1' ? '支付宝' : '微信' //上游 newObj.edit = 'edit' newObj.effectDate = item.effectDate ? item.effectDate diff --git a/src/pages/plan/key/edit.js b/src/pages/plan/key/edit.js index 84a20f30..36489daa 100644 --- a/src/pages/plan/key/edit.js +++ b/src/pages/plan/key/edit.js @@ -186,7 +186,8 @@ export default class acclist extends React.Component { item.product.reduce.map((item1) => { item1.type = 2 item1.only = item1.channel_activity_id - item1.upstream = item.channel === '1' ? '支付宝' : '微信' //上游 + item1.upstream = + String(item.channel) === '1' ? '支付宝' : '微信' //上游 item1.origin = item1 }) item.product = [ @@ -459,7 +460,7 @@ export default class acclist extends React.Component { newObj.only = item.channel_activity_id //批次号 newObj.type = 2 //类型 newObj.checked = item?.checked - newObj.upstream = item.channel === '1' ? '支付宝' : '微信' //上游 + newObj.upstream = String(item.channel) === '1' ? '支付宝' : '微信' //上游 newObj.edit = 'edit' newObj.effectDate = item.effectDate ? item.effectDate From e80dc7456020583c39a2e9aaec17dc97dcda61a9 Mon Sep 17 00:00:00 2001 From: wangsongsole Date: Mon, 13 Jun 2022 16:45:21 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20=E3=80=90=E8=90=A5?= =?UTF-8?q?=E9=94=80=E8=AE=A1=E5=88=92-=E7=AB=8B=E5=87=8F=E9=87=91?= =?UTF-8?q?=E3=80=91=E5=8D=95=E5=A4=A9=E9=A2=84=E7=AE=97=E5=A4=A7=E4=BA=8E?= =?UTF-8?q?=E6=80=BB=E9=A2=84=E7=AE=97=E5=92=8C=E4=BD=8E=E4=BA=8E=E9=9D=A2?= =?UTF-8?q?=E9=A2=9D=E6=B2=A1=E6=9C=89=E7=BB=99=E5=87=BA=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/knockGold/index.jsx | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/components/knockGold/index.jsx b/src/components/knockGold/index.jsx index 212fe9f8..9113fd7e 100644 --- a/src/components/knockGold/index.jsx +++ b/src/components/knockGold/index.jsx @@ -484,6 +484,11 @@ export default class addKnockGold extends Component { return false } + if (this.state.model.day_budget - 0 < this.state.model.reduce_amount - 0) { + Notify.error('单天预算发放上限必须大于面额') + return false + } + if ( parseInt(this.state.model.all_budget / this.state.model.reduce_amount) < this.state.model.receive_number - 0 From da1ac10dab3feaef611ba1d067a5302549777ed1 Mon Sep 17 00:00:00 2001 From: wangsongsole Date: Mon, 13 Jun 2022 17:07:06 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20=E6=96=B0=E5=BB=BA?= =?UTF-8?q?=E7=AB=8B=E5=87=8F=E9=87=91=E4=B8=AD=E7=A7=BB=E5=8A=A8=E7=AB=AF?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/knockGold/index.less | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/components/knockGold/index.less b/src/components/knockGold/index.less index 4e4f0274..e98d8418 100644 --- a/src/components/knockGold/index.less +++ b/src/components/knockGold/index.less @@ -16,6 +16,8 @@ box-sizing: border-box; font-size: 16px; overflow: scroll; + min-width: 375px !important; + width: auto !important; .couponShow { @@ -44,6 +46,7 @@ text-align: center; font-weight: bold; font-size: 36px; + padding: 0 5px; } .coupon_money>span { From 8f40b5fa3a9e0035dd10b88f6a75ff99b42c56e4 Mon Sep 17 00:00:00 2001 From: wangsongsole Date: Mon, 13 Jun 2022 17:25:28 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/knockGold/index.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/knockGold/index.less b/src/components/knockGold/index.less index e98d8418..33d030ef 100644 --- a/src/components/knockGold/index.less +++ b/src/components/knockGold/index.less @@ -121,7 +121,7 @@ /*说明*/ .coupon_explain { - width: 100%; + width: 375px; text-align: center; padding: 0 15px; box-sizing: border-box;