From e775c28ba3a39acc1087f2bca367ede4e471aa8c Mon Sep 17 00:00:00 2001
From: Apple <>
Date: Mon, 19 Sep 2022 09:58:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E3=80=90=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E8=90=BD=E5=9C=B0=E9=A1=B5=E3=80=91=E6=90=9C=E7=B4=A2=E6=A0=8F?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=A1=86=E4=BD=93/=E8=83=8C=E6=99=AF/?=
 =?UTF-8?q?=E6=96=87=E5=AD=97=E9=A2=9C=E8=89=B2=E9=85=8D=E7=BD=AE=E4=B8=8D?=
 =?UTF-8?q?=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 {
             </FormItem>
             <FormItem required={false} labelname="背景颜色:" labelwidth="80px">
               <div className="colorItemfont dfleac">
-                <span style={{ border: '1px solid #f1f2f3' }} className={borderColor == '#fff' ? "cicle activecicle" : "cicle"} onClick={() => { this.bgColorFn('#fff') }}></span>
-                <span className={borderColor == '#04C160' ? "activecicle cicle cicle6" : "cicle cicle6"} onClick={() => { this.bgColorFn('#04C160') }}></span>
-                <span className={borderColor == '#AE99D3' ? "activecicle cicle cicle3" : "cicle cicle3"} onClick={() => { this.bgColorFn('#AE99D3') }}></span>
-                <span className={borderColor == '#FACD6A' ? "activecicle cicle cicle4" : "cicle cicle4"} onClick={() => { this.bgColorFn('#FACD6A') }}></span>
-                <span className={borderColor == '#FE7962' ? "activecicle cicle cicle5" : "cicle cicle5"} onClick={() => { this.bgColorFn('#FE7962') }}></span>
+                <span style={{ border: '1px solid #f1f2f3' }} className={bgColor == '#fff' ? "cicle activecicle" : "cicle"} onClick={() => { this.bgColorFn('#fff') }}></span>
+                <span className={bgColor == '#04C160' ? "activecicle cicle cicle6" : "cicle cicle6"} onClick={() => { this.bgColorFn('#04C160') }}></span>
+                <span className={bgColor == '#AE99D3' ? "activecicle cicle cicle3" : "cicle cicle3"} onClick={() => { this.bgColorFn('#AE99D3') }}></span>
+                <span className={bgColor == '#FACD6A' ? "activecicle cicle cicle4" : "cicle cicle4"} onClick={() => { this.bgColorFn('#FACD6A') }}></span>
+                <span className={bgColor == '#FE7962' ? "activecicle cicle cicle5" : "cicle cicle5"} onClick={() => { this.bgColorFn('#FE7962') }}></span>
                 <div className="selfset">
                   <ColorPicker className="setbgColor" color={bgColor} onChange={this.changebgColor} />
                 </div>
@@ -135,11 +135,11 @@ export default class Searchbar extends React.Component {
             </FormItem>
             <FormItem required={false} labelname="文字颜色:" labelwidth="80px">
               <div className="colorItemfont dfleac">
-                <span style={{ border: '1px solid #f1f2f3' }} className={borderColor == '#fff' ? "cicle activecicle" : "cicle"} onClick={() => { this.fontColorFn('#fff') }}></span>
-                <span className={borderColor == '#04C160' ? "activecicle cicle cicle6" : "cicle cicle6"} onClick={() => { this.fontColorFn('#04C160') }}></span>
-                <span className={borderColor == '#AE99D3' ? "activecicle cicle cicle3" : "cicle cicle3"} onClick={() => { this.fontColorFn('#AE99D3') }}></span>
-                <span className={borderColor == '#FACD6A' ? "activecicle cicle cicle4" : "cicle cicle4"} onClick={() => { this.fontColorFn('#FACD6A') }}></span>
-                <span className={borderColor == '#FE7962' ? "activecicle cicle cicle5" : "cicle cicle5"} onClick={() => { this.fontColorFn('#FE7962') }}></span>
+                <span style={{ border: '1px solid #f1f2f3' }} className={fontColor == '#fff' ? "cicle activecicle" : "cicle"} onClick={() => { this.fontColorFn('#fff') }}></span>
+                <span className={fontColor == '#04C160' ? "activecicle cicle cicle6" : "cicle cicle6"} onClick={() => { this.fontColorFn('#04C160') }}></span>
+                <span className={fontColor == '#AE99D3' ? "activecicle cicle cicle3" : "cicle cicle3"} onClick={() => { this.fontColorFn('#AE99D3') }}></span>
+                <span className={fontColor == '#FACD6A' ? "activecicle cicle cicle4" : "cicle cicle4"} onClick={() => { this.fontColorFn('#FACD6A') }}></span>
+                <span className={fontColor == '#FE7962' ? "activecicle cicle cicle5" : "cicle cicle5"} onClick={() => { this.fontColorFn('#FE7962') }}></span>
                 <div className="selfset">
                   <ColorPicker className="setbgColor" color={fontColor} onChange={this.changefontColor} />
                 </div>
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 {
               />
             </FormItem>
              {
-              this.props.couponType==4&&this.state.model.middle_image? <FormItem labelname="输入框1:"   labelwidth="100px">
+              this.props.couponType==4? <FormItem labelname="输入框1:"   labelwidth="100px">
               <ImageUpload
                 className="zent-image-upload-demo"
                 maxSize={5 * 1024 * 1024}