Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend

src/assets/api.js

@@ -671,7 +671,7 @@ export const putSystemTemplate= (id,data) => {
 }
 //新增系统模板
 export const addSystemTemplate = (data) => {
-	return req('post', baseurl + "/plan/theme/system/",data)
+	return req('post', baseurl + "/plan/theme/system",data)
 }
 //删除系统模板
 export const delSystemTemplate= (id) => {

src/pages/exchangecode/add/add.js

@@ -354,6 +354,7 @@ export default class acclist extends React.Component{
 				obj.product_id = item.product_id;
 				obj.product_type = item.product_type;
 				obj.product_name = item.product_name;
+				obj.account_type = item.account_type;
 				obj.contract_price = item.contract_price;
 				obj.cost_price = item.cost_price;
 				obj.official_price= item.official_price;

src/pages/exchangecode/commodity/goodedit.js

@@ -80,6 +80,7 @@ export default class adduserinfo extends React.Component{
 								let temp ={       //数据模型不可少
 							  id:req.product_id,
 							  type:req.product_type,
+							  account_type:req.account_type,
 							  contract_price:req.contract_price,
 							  official_price:req.official_price,
 							  cost_price:req.cost_price,
@@ -140,6 +141,7 @@ export default class adduserinfo extends React.Component{
 					"product_name": this.state.model.name,
 					"cost_price":this.state.model.cost_price,
 					"contract_price": this.state.model.contract_price,
+					"account_type":this.state.model.account_type,
 					"official_price":this.state.model.official_price,
 					"quantity": this.state.model.stock,
 					"usage": 0,
@@ -176,6 +178,7 @@ export default class adduserinfo extends React.Component{
 			cost_price:cur_product.cost_price,
 			stock:this.state.model.stock,
 			name:this.state.model.name,
+			account_type:cur_product.account_type,
 			show_url:this.state.show_url ,
 			describe_url:this.state.describe_url ,
 		}

src/pages/exchangecode/edit/edit.js

@@ -195,6 +195,7 @@ export default class exchangedit extends React.Component{
 				_object.describe_url= o.describe_url;
 				_object.official_price= o.official_price;
 				_object.product_id= o.product_id
+				_object.account_type =o.account_type;
 				_object.product_name= o.product_name
 				_object.product_type= o.product_type
 				_object.quantity=  o.quantity

src/pages/exchangecode/product/add.js

@@ -122,6 +122,7 @@ export default class adduserinfo extends React.Component{
 			product_name:this.state.model.product_name,
 			show_url:this.state.show_url ? this.state.show_url : "",
 			describe_url:this.state.describe_url ? this.state.describe_url : "",
+			account_type:cur_product.account_type
 		}
 		
 		this.setState({model:model2})

src/pages/plan/add/step2.js

@@ -264,7 +264,7 @@ export default class acclist extends React.Component{
 				obj.quantity = item.quantity;
 				obj.show_url = item.show_url;
 				obj.describe_url = item.describe_url;
-				
+				obj.account_type = item.account_type;
 				return obj
 			})
 			temp.product = arr;

src/pages/plan/key/edit.js

@@ -381,6 +381,7 @@ export default class acclist extends React.Component{
 					obj.product_id = item.product_id;
 					obj.product_type = item.product_type;
 					obj.product_name = item.product_name;
+					obj.account_type = item.account_type;
 					obj.contract_price = item.contract_price;
 					obj.cost_price = item.cost_price;
 					obj.official_price= item.official_price;

src/pages/plan/key/product/add.js

@@ -115,6 +115,7 @@ export default class adduserinfo extends React.Component{
 		let model2 = {
 			product_id:cur_product.id,
 			product_type:cur_product.type,
+			account_type:cur_product.account_type,
 			contract_price:this.state.model.contract_price,
 			official_price:cur_product.official_price,
 			cost_price:cur_product.cost_price,

src/pages/plan/product/add.js

@@ -120,6 +120,7 @@ export default class adduserinfo extends React.Component{
 			cost_price:cur_product.cost_price,
 			quantity:this.state.model.quantity,
 			product_name:this.state.model.product_name,
+			account_type:cur_product.account_type,
 			show_url:this.state.show_url ? this.state.show_url : "",
 			describe_url:this.state.describe_url ? this.state.describe_url : "",
 		}

src/pages/system/systemMould/main.js

@@ -32,6 +32,14 @@ const Column = [
     type: "slot",
    width:'auto',
     
+  },
+  {
+    title: '权重',
+    prop: 'sort',
+    name: 'sort',
+    type: "normal",
+   width:'auto',
+    
   },
   {
     title: '更新时间',