Merge branch 'master' of http://gitee.vandh.cn/walvax/fxc-wecat

pages/index/index.js

@@ -1507,17 +1507,30 @@ Page({
       option.grid.bottom='13%';
       option.series = [];
       option.xAxis.data = [];
-      list.map((item,index)=>{
-        const {stack,end,trans,} = item;
-        option.xAxis.data.push(item.productName);
+      const echartsData = [
+        {
+          name:'在库',
+          data:list.map(item=>item.stack)
+        },
+        {
+          name:'结束',
+          data:list.map(item=>item.end)
+        },
+        {
+          name:'在途',
+          data:list.map(item=>item.trans)
+        }
+      ]
+      option.xAxis.data = list.map(item=>item.productName);
+      echartsData.map((item,index)=>{
         option.series.push({
-          name:item.productName,
+          name:item.name,
           type: "bar",
           stack: "Ad",
           emphasis: {
             focus: "series",
           },
-          data:[stack,trans,end]
+          data:item.data
         })
       })
       console.log(option);