From c27ebf9beddab80b4528271778ea9c8872038deb Mon Sep 17 00:00:00 2001
From: Apple <>
Date: Mon, 19 Sep 2022 14:34:04 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BC=98=E6=83=A0=E5=88=B8/?=
 =?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=E8=BE=93=E5=85=A5=E6=A1=86=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E4=B8=8E=E4=B8=8A=E4=BC=A0=E4=B8=8D=E4=B8=80=E8=87=B4?=
 =?UTF-8?q?=EF=BC=8C=E7=BB=84=E4=BB=B6=E6=9C=AA=E5=8F=8A=E6=97=B6=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../couponTemplate/landingPage/config/main.js | 13 +++-----
 src/pages/exchangepage/edittemplate/main.js   | 33 ++++---------------
 2 files changed, 11 insertions(+), 35 deletions(-)

diff --git a/src/pages/exchangepage/couponTemplate/landingPage/config/main.js b/src/pages/exchangepage/couponTemplate/landingPage/config/main.js
index 0b128e3e..15a11122 100644
--- a/src/pages/exchangepage/couponTemplate/landingPage/config/main.js
+++ b/src/pages/exchangepage/couponTemplate/landingPage/config/main.js
@@ -265,9 +265,6 @@ export default class edittemplate extends React.Component {
                 </div>
               </div>
             </FormItem>
-            {
-              this.props.couponType==4?<div>123</div>:<div>456</div>
-            }
             <div style={{ marginTop: '20px', fontWeight: 'bold' }}>基础图层</div>
             <FormItem labelname="顶部banner:" prop="top" id="top" labelwidth="100px">
               <ImageUpload
@@ -284,7 +281,7 @@ export default class edittemplate extends React.Component {
               />
             </FormItem>
              {
-              this.props.couponType==4? <FormItem labelname="输入框1:"   labelwidth="100px">
+              this.props.couponType==4? <FormItem labelname="输入框:"   labelwidth="100px" key={1}>
               <ImageUpload
                 className="zent-image-upload-demo"
                 maxSize={5 * 1024 * 1024}
@@ -293,19 +290,19 @@ export default class edittemplate extends React.Component {
                 sortable
                 tips="单张图片不超过 5M"
                 onChange={(e) => { this.onUploadChange1(e,'middle_image') }}
-                defaultFileList={[{ 'src': this.state.model.middle_image }] }
+                defaultFileList={this.state.model.middle_image ? [{ 'src': this.state.model.middle_image }] : null}
                 onUpload={this.onUpload}
                 onError={this.onUploadError}
               />
             </FormItem>: 
-            <FormItem labelname="输入框2:"  labelwidth="100px">
+            <FormItem labelname="输入框:"  labelwidth="100px" key={2}>
               <ImageUpload
                 className="zent-image-upload-demo"
                 maxSize={5 * 1024 * 1024}
                 maxAmount={1}
                 multiple
                 sortable
-                tips="单张图片不超过 54M"
+                tips="单张图片不超过 5M"
                 onChange={(e) => { this.onUploadChange1(e,'white_image') }}
                 defaultFileList={this.state.model.white_image ? [{ 'src': this.state.model.white_image }] : null}
                 onUpload={this.onUpload}
@@ -313,8 +310,6 @@ export default class edittemplate extends React.Component {
               />
             </FormItem>
              } 
-            {this.state.model.white_image}
-           
             <FormItem myClassName="activeSet" required={false} labelname="活动说明:" prop="bottom" id="bottom" labelwidth="100px">
               <RadioGroup onChange={(e) => { this.onactivityChange(e) }} value={this.state.model.describe.type}>
                 <RadioButton value={"1"} onClick={() => this.hasItemFn(1)}>图片</RadioButton>
diff --git a/src/pages/exchangepage/edittemplate/main.js b/src/pages/exchangepage/edittemplate/main.js
index a30a45df..64468997 100644
--- a/src/pages/exchangepage/edittemplate/main.js
+++ b/src/pages/exchangepage/edittemplate/main.js
@@ -17,8 +17,7 @@ import Whitegoods from './whitegoods' //白名单商品页面
 import Whitedetails from './whitedetails' //白名单详情页
 import Reduce from './reduce' //商品详情页立减金
 import ReduceConfig from './reduceConfig' //商品详情立减金页面
-import SearchBarView from './couponConfig/searchBar' 
-import BottomBarView from './couponConfig/bottomBar' 
+ 
 // 优惠券
 import CouponLandingForm from '../couponTemplate/landingPage/config/main' //优惠券落地页表单
 import CouponGoodsListForm from '../couponTemplate/goodsPage/config/main' //优惠券商品列表页
@@ -889,16 +888,7 @@ export default class edittemplate extends React.Component {
                   )}
 
                 <div className='hascode'>
-                  {!this.state.model.middle_image ? (
-                    <img
-                      id='top'
-                      src={
-                        'https://lsxd-yunshanfu.oss-cn-hangzhou.aliyuncs.com/common_image/20220105/5dd765e3b46042f7ecd8c576e6fa9568.png'
-                      }
-                    />
-                  ) : (
-                      <img src={this.state.model.middle_image} id='top' />
-                    )}
+                  <img src={this.state.showType==8?this.state.model.white_image?this.state.model.white_image:'https://lsxd-yunshanfu.oss-cn-hangzhou.aliyuncs.com/common_image/20220105/5dd765e3b46042f7ecd8c576e6fa9568.png':this.state.model.middle_image?this.state.model.middle_image:'https://lsxd-yunshanfu.oss-cn-hangzhou.aliyuncs.com/common_image/20220105/5dd765e3b46042f7ecd8c576e6fa9568.png'} id='top' />
                   {[1,4].includes(this.state.showType)? (
                     <img
                       src={
@@ -1055,20 +1045,11 @@ export default class edittemplate extends React.Component {
                         )}
                     </div>
                     <div className='center' id='center'>
-                      {!this.state.model.middle_image ? (
-                        <img
-                          id='center-img'
-                          src={
-                            'https://lsxd-yunshanfu.oss-cn-hangzhou.aliyuncs.com/common_image/20220105/5dd765e3b46042f7ecd8c576e6fa9568.png'
-                          }
-                        />
-                      ) : (
-                          <img
-                            crossOrigin='anonymous'
-                            id='center-img'
-                            src={this.state.model.middle_image}
-                          />
-                        )}
+                      <img
+                        crossOrigin='anonymous'
+                        id='center-img'
+                        src={this.state.showType==8?this.state.model.white_image?this.state.model.white_image:'https://lsxd-yunshanfu.oss-cn-hangzhou.aliyuncs.com/common_image/20220105/5dd765e3b46042f7ecd8c576e6fa9568.png':this.state.model.middle_image?this.state.model.middle_image:'https://lsxd-yunshanfu.oss-cn-hangzhou.aliyuncs.com/common_image/20220105/5dd765e3b46042f7ecd8c576e6fa9568.png'} 
+                      />
                       {[1,4].includes(this.state.showType) ? (
                         <img
                           src={