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

src/pages/exchangecode/commodity/goodedit.js

@@ -164,7 +164,6 @@ export default class adduserinfo extends React.Component{
 			
 			putCodeProduct(code_batch_id,product_id,formdata).then((res)=>{
 			handelResponse(res,(req,msg)=>{
-				console.log(req)
 				let model2 = this.state.model;
 				model2.show_url = req.path;
 			   this.setState({model:model2})
@@ -172,11 +171,12 @@ export default class adduserinfo extends React.Component{
 			   Notify.clear();
 			   Notify.success(msg);
 			   setTimeout(()=>{
-			   							window.history.back()
+			  window.history.back()
 			   },1000);
-			})
+			},(error)=>{
+				Notify.error(error);
+				})
 			});
-			
 		}
 	}
 	onProductChange(e){

src/pages/order/list/list.js

@@ -83,7 +83,7 @@ const Column = [
     prop: 'opearo',
     name: 'opearo',
     type: "slot",
-    width:'50px',
+    width:'140px',
   },
   {
     title: '创建时间',