From e775c28ba3a39acc1087f2bca367ede4e471aa8c Mon Sep 17 00:00:00 2001 From: Apple <> Date: Mon, 19 Sep 2022 09:58:08 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E3=80=90=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E8=90=BD=E5=9C=B0=E9=A1=B5=E3=80=91=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E6=A0=8F=E8=AE=BE=E7=BD=AE=E6=A1=86=E4=BD=93/=E8=83=8C?= =?UTF-8?q?=E6=99=AF/=E6=96=87=E5=AD=97=E9=A2=9C=E8=89=B2=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E4=B8=8D=E4=B8=80=E8=87=B4bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../goodsPage/config/searchBar.js | 20 +++++++++---------- .../couponTemplate/landingPage/config/main.js | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/pages/exchangepage/couponTemplate/goodsPage/config/searchBar.js b/src/pages/exchangepage/couponTemplate/goodsPage/config/searchBar.js index af27e048..9b5ce81d 100644 --- a/src/pages/exchangepage/couponTemplate/goodsPage/config/searchBar.js +++ b/src/pages/exchangepage/couponTemplate/goodsPage/config/searchBar.js @@ -123,11 +123,11 @@ export default class Searchbar extends React.Component {
- { this.bgColorFn('#fff') }}> - { this.bgColorFn('#04C160') }}> - { this.bgColorFn('#AE99D3') }}> - { this.bgColorFn('#FACD6A') }}> - { this.bgColorFn('#FE7962') }}> + { this.bgColorFn('#fff') }}> + { this.bgColorFn('#04C160') }}> + { this.bgColorFn('#AE99D3') }}> + { this.bgColorFn('#FACD6A') }}> + { this.bgColorFn('#FE7962') }}>
@@ -135,11 +135,11 @@ export default class Searchbar extends React.Component {
- { this.fontColorFn('#fff') }}> - { this.fontColorFn('#04C160') }}> - { this.fontColorFn('#AE99D3') }}> - { this.fontColorFn('#FACD6A') }}> - { this.fontColorFn('#FE7962') }}> + { this.fontColorFn('#fff') }}> + { this.fontColorFn('#04C160') }}> + { this.fontColorFn('#AE99D3') }}> + { this.fontColorFn('#FACD6A') }}> + { this.fontColorFn('#FE7962') }}>
diff --git a/src/pages/exchangepage/couponTemplate/landingPage/config/main.js b/src/pages/exchangepage/couponTemplate/landingPage/config/main.js index 0dc9f6cc..0b128e3e 100644 --- a/src/pages/exchangepage/couponTemplate/landingPage/config/main.js +++ b/src/pages/exchangepage/couponTemplate/landingPage/config/main.js @@ -284,7 +284,7 @@ export default class edittemplate extends React.Component { /> { - this.props.couponType==4&&this.state.model.middle_image? + this.props.couponType==4? Date: Mon, 19 Sep 2022 10:42:23 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=B8=8E=E5=90=8E=E7=AB=AF=E5=AF=B9?= =?UTF-8?q?=E6=8E=A5=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E4=BC=98=E6=83=A0?= =?UTF-8?q?=E5=8D=B7-=E5=BE=85=E6=94=AF=E4=BB=98=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E5=AD=97=E6=AE=B5=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/order/list/list.js | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/src/pages/order/list/list.js b/src/pages/order/list/list.js index a3945d12..4806a73e 100644 --- a/src/pages/order/list/list.js +++ b/src/pages/order/list/list.js @@ -148,18 +148,18 @@ const Column = [ type: "slot" }, { - title: "折扣", - name: "discount", + title: "减扣价（元）", + name: "discount_amount", + prop: "discount_amount", type: "normal", - prop: "discount", width: "80px" }, { - title: "结算", - name: "total", - prop: "total", - width: "auto", - type: "80px" + title: "结算价（元）", + name: "pay_amount", + prop: "pay_amount", + type: "normal", + width: "80px" }, { title: "key", @@ -198,11 +198,7 @@ export default class orderlist extends React.Component { { id: 111, name: "立减金-待领取" }, { id: 222, name: "立减金-已领取" }, { id: 5, name: "立减金-已过期" }, - { id: 6, name: "优惠券-待支付" }, - { id: 7, name: "优惠券-已支付" }, - { id: 8, name: "优惠券-已完成" }, - { id: 9, name: "优惠券-已取消" }, - { id: 10, name: "优惠券-充值失败" } + { id: 6, name: "优惠券-待支付" } ] } ], @@ -583,6 +579,7 @@ export default class orderlist extends React.Component { }) .catch((err) => {}) } + optiononChange(e) { let placeholder let searchOption = Number(e ? e.key : 0) From a6d24316b43c0b1a5392f9f1e6ab3cadf43b7b66 Mon Sep 17 00:00:00 2001 From: Apple <> Date: Mon, 19 Sep 2022 11:01:17 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E4=B8=8E?= =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E7=99=BD=E5=90=8D=E5=8D=95Tab?= =?UTF-8?q?=E5=88=87=E6=8D=A2=EF=BC=8C=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/exchangepage/edittemplate/main.js | 38 ++++++++++----------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/src/pages/exchangepage/edittemplate/main.js b/src/pages/exchangepage/edittemplate/main.js index 63ae2bd0..a30a45df 100644 --- a/src/pages/exchangepage/edittemplate/main.js +++ b/src/pages/exchangepage/edittemplate/main.js @@ -590,7 +590,6 @@ export default class edittemplate extends React.Component { landConfig.bg_color = c this.setState({ model: landConfig }) } - // getlandftcolor(c) { let landConfig = this.state.model landConfig.font_color = c @@ -656,27 +655,26 @@ export default class edittemplate extends React.Component { this.setState({ product_list: goodsConfig }) } onmodelChange(e) { - this.setState({ showType: e.target.value, activeNavStatus: 1 }) let editorData = _.cloneDeep(JSON.parse(sessionStorage.getItem('editorConfig'))) - if (e.target.value == 1) { - let whiteData = editorData.whiteList - let { land, product_list, product_detail } = whiteData; - this.setState({ model: land, product_list, product_detail }) - if (this.state.mouldType == 0) { - let whiteLand = whiteData.land - whiteLand.title = this.state.model.title - this.setState({ model: whiteLand }) - } - } else if (e.target.value == 3) { - let exchangeData = editorData.exchangeList - let { land, product_list, product_detail } = exchangeData; - this.setState({ model: land, product_list, product_detail }) - } else{//优惠券+优惠券白名单 - let couponData = editorData.coupon - let { land, product_list, product_detail } = couponData; - console.log(222,this.state.model); - this.setState({ model: land, product_list, product_detail }) + let holdData; + switch(e.target.value){ + case 1: + holdData= editorData.whiteList; + break; + case 3: + holdData= editorData.exchangeList + break; + default: + let {activeNavStatus,showType,model}=this.state; + if(activeNavStatus==1&&[4,8].includes(showType)){//落地页 + editorData.coupon.land=model; + } + sessionStorage.setItem('editorConfig',JSON.stringify(editorData)); + holdData= editorData.coupon + break; } + let { land, product_list, product_detail } = holdData; + this.setState({ showType: e.target.value, activeNavStatus: 1,model: land, product_list, product_detail }) } onPreview() { this.setState({ previewData: this.state })