Authored by Aiden Xu

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

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