Authored by Aiden Xu

Merge remote-tracking branch 'origin/develop' into develop

@@ -37,7 +37,7 @@ let channel = { @@ -37,7 +37,7 @@ let channel = {
37 cache: true, 37 cache: true,
38 code: 200 38 code: 200
39 }).then(result => { 39 }).then(result => {
40 - return result.data ? processProductList(result.data['process-list']) : []; 40 + return result.data ? processProductList(result.data.product_list) : [];
41 }); 41 });
42 }, 42 },
43 }; 43 };
@@ -32,7 +32,6 @@ @@ -32,7 +32,6 @@
32 productSkn: productSkn.join(',') 32 productSkn: productSkn.join(',')
33 } 33 }
34 }).then(result => { 34 }).then(result => {
35 - console.log(result);  
36 this.productList = result; 35 this.productList = result;
37 }); 36 });
38 } 37 }
@@ -40,4 +39,7 @@ @@ -40,4 +39,7 @@
40 </script> 39 </script>
41 40
42 <style> 41 <style>
  42 + .goods {
  43 + background: #fff;
  44 + }
43 </style> 45 </style>