From 1d351102da192ccd2ed33ddb56c390ed8af5afa5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E7=BA=A2=E6=A2=85?= <1924913374@qq.com>
Date: Fri, 2 Sep 2022 10:43:38 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=99=A8=E5=9F=BA=E7=A1=80?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=BA=93=E9=85=8D=E7=BD=AE=E9=9D=99=E6=80=81?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=BC=96=E5=86=99=E5=AE=8C=E6=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../goodsPage/config/bottomBar.js             |  4 +-
 .../couponTemplate/goodsPage/config/main.js   |  2 +-
 .../goodsPage/config/searchBar.js             |  2 +-
 .../couponTemplate/goodsPage/config/title.js  | 59 ++++++++++++-------
 src/pages/exchangepage/edittemplate/main.js   |  5 +-
 5 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/src/pages/exchangepage/couponTemplate/goodsPage/config/bottomBar.js b/src/pages/exchangepage/couponTemplate/goodsPage/config/bottomBar.js
index 674ac056..55d98d62 100644
--- a/src/pages/exchangepage/couponTemplate/goodsPage/config/bottomBar.js
+++ b/src/pages/exchangepage/couponTemplate/goodsPage/config/bottomBar.js
@@ -15,7 +15,7 @@ export default class edittemplate extends React.Component {
       model: {
         top_image: "",
         list: "2",
-        font_color: "#f1f2f3",
+        font_color: "#000000",
         button_color: "#FACD6A",
         describe: { type: "", content: "", bg_image: '' },
         checkedLarge: false
@@ -379,7 +379,7 @@ export default class edittemplate extends React.Component {
             <div className="color-control">
               <FormItem labelname="选中文字颜色:" prop="bg_color" id="bg_color" labelwidth="140px">
                 <div className="colorItemfont dflexajce">
-                  <span style={{ border: '1px solid #f1f2f3' }} className={this.state.model.font_color == '#f0f' ? "cicle activecicle" : "cicle"} onClick={() => { this.fontcolor('#f0f') }}></span>
+                  <span style={{ border: '1px solid #f1f2f3' }} className={this.state.model.font_color == '#000000' ? "cicle activecicle" : "cicle"} onClick={() => { this.fontcolor('#000000') }}></span>
                   <span className={this.state.model.font_color == '#04C160' ? "activecicle cicle cicle6" : "cicle cicle6"} onClick={() => { this.fontcolor('#04C160') }}></span>
                   <span className={this.state.model.font_color == '#AE99D3' ? "activecicle cicle cicle3" : "cicle cicle3"} onClick={() => { this.fontcolor('#AE99D3') }}></span>
                   <span className={this.state.model.font_color == '#FACD6A' ? "activecicle cicle cicle4" : "cicle cicle4"} onClick={() => { this.fontcolor('#FACD6A') }}></span>
diff --git a/src/pages/exchangepage/couponTemplate/goodsPage/config/main.js b/src/pages/exchangepage/couponTemplate/goodsPage/config/main.js
index c6ffbf05..d6ca7f02 100644
--- a/src/pages/exchangepage/couponTemplate/goodsPage/config/main.js
+++ b/src/pages/exchangepage/couponTemplate/goodsPage/config/main.js
@@ -104,7 +104,7 @@ export default class edittemplate extends React.Component {
     if (type === 'overMaxAmount') {
       Notify.error(`最多可上传 ${data.maxAmount} 张图片`);
     } else if (type === 'overMaxSize') {
-      Notify.error(`图片大小超过 ${data.formattedMaxSize}`);
+      Notify.error(`图片大小不能超过 ${data.formattedMaxSize}`);
     }
   };
   handleChange = (color) => {
diff --git a/src/pages/exchangepage/couponTemplate/goodsPage/config/searchBar.js b/src/pages/exchangepage/couponTemplate/goodsPage/config/searchBar.js
index 5dcf0f34..29517e78 100644
--- a/src/pages/exchangepage/couponTemplate/goodsPage/config/searchBar.js
+++ b/src/pages/exchangepage/couponTemplate/goodsPage/config/searchBar.js
@@ -211,7 +211,7 @@ export default class edittemplate extends React.Component {
                 </RadioGroup>
               </FormItem>
             </div>
-            <FormItem required={false} labelname="活动说明:" prop="bottom" id="bottom" labelwidth="100px">
+            <FormItem required={false} labelname="文字格式:" prop="bottom" id="bottom" labelwidth="100px">
                 <RadioGroup onChange={(e) => { this.onactivityChange(e) }} value={this.state.model.describe.type}>
                   <RadioButton onClick={() => this.hasItemFn(1)} value={"1"}>居左</RadioButton>
                   <RadioButton onClick={() => this.hasItemFn(2)} value={"2"}>居中</RadioButton>
diff --git a/src/pages/exchangepage/couponTemplate/goodsPage/config/title.js b/src/pages/exchangepage/couponTemplate/goodsPage/config/title.js
index d0cab8d9..86d5637d 100644
--- a/src/pages/exchangepage/couponTemplate/goodsPage/config/title.js
+++ b/src/pages/exchangepage/couponTemplate/goodsPage/config/title.js
@@ -203,32 +203,47 @@ export default class edittemplate extends React.Component {
 
         <div style={{ width: "92%", "margin": "0 auto", "overflow": "auto", "maxHeight": "100%" }}>
           <Form model={this.state.model} ref="form1">
-              <FormItem labelname="字体颜色:" prop="bg_color" id="bg_color" labelwidth="80px">
-            <div className="colorItemfont dfleac">
-              <span style={{ border: '1px solid #f1f2f3' }} className={this.state.model.font_color == '#f0f' ? "cicle activecicle" : "cicle"} onClick={() => { this.fontcolor('#f0f') }}></span>
-              <span className={this.state.model.font_color == '#04C160' ? "activecicle cicle cicle6" : "cicle cicle6"} onClick={() => { this.fontcolor('#04C160') }}></span>
-              <span className={this.state.model.font_color == '#AE99D3' ? "activecicle cicle cicle3" : "cicle cicle3"} onClick={() => { this.fontcolor('#AE99D3') }}></span>
-              <span className={this.state.model.font_color == '#FACD6A' ? "activecicle cicle cicle4" : "cicle cicle4"} onClick={() => { this.fontcolor('#FACD6A') }}></span>
-              <span className={this.state.model.font_color == '#FE7962' ? "activecicle cicle cicle5" : "cicle cicle5"} onClick={() => { this.fontcolor('#FE7962') }}></span>
-              <div className="selfset">
-                <ColorPicker className="setbgColor" color={this.state.model.font_color} onChange={this.handleChange1} />
-              </div>
-            </div>
-          </FormItem>
             <FormItem labelname="标题文字:" prop="title" id="title" labelwidth="100px">
-            <Ipt onChange={(e) => {
-              let model2 = this.state.model;
-              model2.title = e;
-              this.setState({ model: model2 })
-              this.props.settitle(e)
-            }}
-              onClearItem={(e) => {
+              <Ipt onChange={(e) => {
                 let model2 = this.state.model;
-                model2.title = "";
+                model2.title = e;
                 this.setState({ model: model2 })
+                this.props.settitle(e)
               }}
-              value={this.state.model.title} placeholder={"请输入"} labelWidth={'0px'} maxLength={12} height={'36px'} width={'300px'} alignment={'left'} />
-          </FormItem>
+                onClearItem={(e) => {
+                  let model2 = this.state.model;
+                  model2.title = "";
+                  this.setState({ model: model2 })
+                }}
+                value={this.state.model.title} placeholder={"请输入"} labelWidth={'0px'} maxLength={12} height={'36px'} width={'300px'} alignment={'left'} />
+            </FormItem>
+            <FormItem required={false} labelname="文字格式:" prop="bottom" id="bottom" labelwidth="100px">
+              <RadioGroup onChange={(e) => { this.onactivityChange(e) }} value={this.state.model.describe.type}>
+                <RadioButton onClick={() => this.hasItemFn(1)} value={"1"}>居左</RadioButton>
+                <RadioButton onClick={() => this.hasItemFn(2)} value={"2"}>居中</RadioButton>
+                <RadioButton onClick={() => this.hasItemFn(2)} value={"2"}>居右</RadioButton>
+              </RadioGroup>
+            </FormItem>
+            <FormItem labelname="字体颜色:" prop="bg_color" id="bg_color" labelwidth="80px">
+              <div className="colorItemfont dfleac">
+                <span style={{ border: '1px solid #f1f2f3' }} className={this.state.model.font_color == '#f0f' ? "cicle activecicle" : "cicle"} onClick={() => { this.fontcolor('#f0f') }}></span>
+                <span className={this.state.model.font_color == '#04C160' ? "activecicle cicle cicle6" : "cicle cicle6"} onClick={() => { this.fontcolor('#04C160') }}></span>
+                <span className={this.state.model.font_color == '#AE99D3' ? "activecicle cicle cicle3" : "cicle cicle3"} onClick={() => { this.fontcolor('#AE99D3') }}></span>
+                <span className={this.state.model.font_color == '#FACD6A' ? "activecicle cicle cicle4" : "cicle cicle4"} onClick={() => { this.fontcolor('#FACD6A') }}></span>
+                <span className={this.state.model.font_color == '#FE7962' ? "activecicle cicle cicle5" : "cicle cicle5"} onClick={() => { this.fontcolor('#FE7962') }}></span>
+                <div className="selfset">
+                  <ColorPicker className="setbgColor" color={this.state.model.font_color} onChange={this.handleChange1} />
+                </div>
+              </div>
+            </FormItem>
+            <FormItem required={false} labelname="文字大小:" prop="bottom" id="bottom" labelwidth="100px">
+              <RadioGroup onChange={(e) => { this.onactivityChange(e) }} value={this.state.model.describe.type}>
+                <RadioButton onClick={() => this.hasItemFn(1)} value={"1"}>A-</RadioButton>
+                <RadioButton onClick={() => this.hasItemFn(2)} value={"2"}>A</RadioButton>
+                <RadioButton onClick={() => this.hasItemFn(2)} value={"2"}>A+</RadioButton>
+              </RadioGroup>
+            </FormItem>
+
           </Form>
         </div>
       </div>
diff --git a/src/pages/exchangepage/edittemplate/main.js b/src/pages/exchangepage/edittemplate/main.js
index 5bdb2859..1c2fde79 100644
--- a/src/pages/exchangepage/edittemplate/main.js
+++ b/src/pages/exchangepage/edittemplate/main.js
@@ -847,13 +847,12 @@ export default class edittemplate extends React.Component {
           </div>
             {/* 组件库 */}
             {
-              this.state.showType==2? <CouponComLib componentName={(c)=>this.componentName(c)}/>:null
+              this.state.showType==2&&this.state.activeNavStatus==2? <CouponComLib componentName={(c)=>this.componentName(c)}/>:null
             }
-       {/* this.state.showType==2&&this.state.activeNavStatus==2? */}
         </div>
       
         <div className='xj-wrapper' style={{ 'zIndex': '1' }}>
-          <div  className={this.state.showType==2?'xj-center-small':'xj-center'}>
+          <div  className={ this.state.showType==2&&this.state.activeNavStatus==2?'xj-center-small':'xj-center'}>
             {this.state.activeNavStatus == 1 ? (
               <div>
                 <img