Merge branch 'couponV2.0' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0

src/pages/coupon/commodity/index.jsx

@@ -16,89 +16,84 @@ import "./style.less";
 const tableColumn = [
   {
     title: "商品编号",
-    name: "id",
+    name: "product_id",
-    prop: "id",
+    prop: "product_id",
+    className: "name",
     type: "normal",
     width: "auto",
   },
   {
     title: "商品名称",
-    name: "product_name",
     prop: "product_name",
+    name: "product_name",
+    width: "200px",
     type: "normal",
-    width: "auto",
   },
   {
-    title: "官方价",
+    title: "立减金平台批次号",
+    width: "200px",
+    prop: "channel_activity_id",
+    name: "channel_activity_id",
+    type: "normal",
+  },
+  {
+    title: "上游平台",
+    width: "auto",
+    prop: "upstream",
+    name: "upstream",
+    type: "normal",
+  },
+  {
+    title: "商品权重",
+    width: "auto",
+    prop: "weight",
+    name: "weight",
+    type: "normal",
+  },
+  {
+    title: "有效时间段",
+    width: "500px",
+    prop: "effectDate",
+    name: "effectDate",
+    type: "normal",
+  },
+  {
+    title: "官方价格",
     name: "official_price",
     prop: "official_price",
     type: "normal",
     width: "auto",
   },
   {
-    title: "合同单价",
+    title: "合同价",
     name: "contract_price",
+    type: "normal",
     prop: "contract_price",
-    type: "normal",
-    width: "auto",
-  },
-  {
-    title: "库存数量",
-    name: "quantity",
-    prop: "quantity",
-    type: "normal",
-    width: "auto",
-  },
-  {
-    title: "批次号",
-    name: "channel_activity_id",
-    prop: "channel_activity_id",
-    type: "normal",
-    width: "auto",
-  },
-  {
-    title: "总预算",
-    name: "all_budget",
-    prop: "all_budget",
-    type: "normal",
-    width: "auto",
-  },
-  {
-    title: "有效时间段",
-    name: "effectDate",
-    prop: "effectDate",
-    type: "normal",
     width: "auto",
   },
   {
     title: "创建时间",
     name: "create_time",
-    prop: "create_time",
     type: "normal",
-    width: "auto",
+    prop: "create_time",
+    width: "250px",
   },
   {
     title: "类型",
     name: "product_type_text",
+    type: "normal",
     prop: "product_type_text",
-    type: "normal",
-    width: "auto",
-  },
-  {
-    title: "上游平台",
-    name: "upstream",
-    prop: "upstream",
-    type: "normal",
     width: "auto",
   },
   {
     title: "操作",
-    name: "opearo",
     prop: "opearo",
+    name: "opearo",
     type: "slot",
     width: "200px",
   },
 ];
+
 const UseCouponCommodity = () => {
   const [state, setState] = useSetState({
     tabList: [{ title: "商品范围列表", index: 0 }],

src/pages/exchangepage/edittemplate/couponCard/goodsPage/config/picture.js

@@ -131,7 +131,7 @@ export default class edittemplate extends React.Component {
                 onClearItem={(e) => {
                   this.setState({ jumpUrl: '' })
                 }}
-                value={this.state.jumpUrl} placeholder={"请输入"} labelWidth={'0px'} maxLength={12} height={'36px'} width={'300px'} alignment={'left'} />
+                value={this.state.jumpUrl} placeholder={"请输入"} labelWidth={'0px'} maxLength={50} height={'36px'} width={'300px'} alignment={'left'} />
             </FormItem>:null
             }
           </Form>

src/pages/exchangepage/edittemplate/main.js

@@ -167,6 +167,8 @@ export default class edittemplate extends React.Component {
     Bus.addListener('componentLib', (prop) => {
       let couponEditorInfo = _.cloneDeep(JSON.parse(sessionStorage.getItem('editorConfig')))
       let coupongoodsConfig = this.state.product_list
+      console.log('coupongoodsConfig',coupongoodsConfig);
+      console.log('prop.attr',prop.attr);
       coupongoodsConfig[prop.attr].iswitch = prop.value
       this.setState({ product_list: coupongoodsConfig })
       if(prop.value==0){

src/pages/exchangepage/edittemplate/main.less

@@ -552,7 +552,7 @@
 			}
 			.detailstemplatescale{
 				.detailstemplate{
-				transform: scale(0.31);
+				transform: scale(0.387);
 				transform-origin: 0 0;
 				img{
 					width: auto!important;
@@ -563,8 +563,8 @@
 			}
 			}
 			.thumbheader {
-				width: 115px;
+				width: 145px;
-				height: 158px;
+				height: 200px;
 				background: #F4F6F9;
 				overflow: hidden;
 				margin-top: 5px;
@@ -578,16 +578,12 @@
 
 				.goodsList-item {
 					.goodstemplate {
-						transform: scale(0.31);
+						transform: scale(0.387);
 						transform-origin: 0 0;
 					}
 
 					.editor-main {
 						top: 0;
-
-						// img {
-						// 	width: auto !important;
-						// }
 					}
 
 				}