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;