From 3698ffab6ffcffc27d55bf4fc3f73dcd802f833e Mon Sep 17 00:00:00 2001
From: Apple <>
Date: Tue, 18 Oct 2022 11:43:54 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E6=A8=A1=E6=9D=BF):?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9C=A8=E4=BC=98=E6=83=A0=E5=88=B8=E4=B8=AD?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E5=9B=BE=E7=89=87=E3=80=81=E8=83=8C?=
 =?UTF-8?q?=E6=99=AF=E5=9B=BE=E3=80=81=E6=90=9C=E7=B4=A2=E6=A0=8F=E3=80=81?=
 =?UTF-8?q?=E5=BA=95=E9=83=A8=E6=A0=8F=EF=BC=8C=E5=88=87=E6=8D=A2=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E4=BF=9D=E5=AD=98=E6=97=B6=EF=BC=8C=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E7=9A=84=E5=9F=BA=E7=A1=80=E7=BB=84=E4=BB=B6=E6=B6=88=E5=A4=B1?=
 =?UTF-8?q?=E4=B8=8D=E8=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../edittemplate/couponCard/goodsPage/config/main.js  | 11 +++--------
 .../exchangepage/edittemplate/goodstemplate.less      |  1 -
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/pages/exchangepage/edittemplate/couponCard/goodsPage/config/main.js b/src/pages/exchangepage/edittemplate/couponCard/goodsPage/config/main.js
index 45e5cd94..0bddeae6 100644
--- a/src/pages/exchangepage/edittemplate/couponCard/goodsPage/config/main.js
+++ b/src/pages/exchangepage/edittemplate/couponCard/goodsPage/config/main.js
@@ -10,6 +10,7 @@ import BottomBar from './bottomBar';
 import Picture from './picture.js'; //白名单商品页面
 import SearchBar from './searchBar.js';
 import Title from './title';
+import _ from "lodash"
 export default class couponGoodConfig extends React.Component {
   constructor(props) {
     super(props)
@@ -113,35 +114,29 @@ export default class couponGoodConfig extends React.Component {
       let count = 0;
       const update = () => {
         if (path) {
-
           resolve(
             path
           );
-
         }
         else {
-
           if (count < 100) {
             count += 2;
             report(count);
             setTimeout(update, 500);
           }
           else {
-
             reject();
           }
         }
-
-
       };
       setTimeout(update, 500);
     });
-
   };
   componentWillUnmount() {
     let oldobj = JSON.parse(sessionStorage.getItem('editorConfig'));
+    let {top_image,list,font_color,button_color,describe}=this.state.model;
     let coupon = oldobj.coupon
-    coupon.product_list = this.state.model;
+    coupon.product_list =_.assign(coupon.product_list,{top_image,list,font_color,button_color,describe});
     oldobj.coupon = coupon;
     sessionStorage.setItem('editorConfig', JSON.stringify(oldobj));
   }
diff --git a/src/pages/exchangepage/edittemplate/goodstemplate.less b/src/pages/exchangepage/edittemplate/goodstemplate.less
index a76957e5..ddd8a741 100644
--- a/src/pages/exchangepage/edittemplate/goodstemplate.less
+++ b/src/pages/exchangepage/edittemplate/goodstemplate.less
@@ -1,7 +1,6 @@
 .goodstemplate,
 .detailstemplate {
   height: 653px;
-  background: #F2F7F8;
   position: relative;
   overflow-y: auto;
   overflow-x: hidden;