fix

@@ -171,16 +171,8 @@ export default {
       await service.get("v2/rs/sale/hours", {}).then(ret => {
       await service.get("v2/rs/sale/hours", {}).then(ret => {
         const data = ret.data;
         const data = ret.data;
 
 
-        _.each(data, (item, key) => {
-          item.lineTime = item.dayHour;
-        });
-
-        _.each(data, (item, key) => {
-          item.beforeAmount = item.beforeAmount;
-        });
-
         let rows = {
         let rows = {
-          lineTime: _.map(data, "lineTime"),
+          lineTime: _.map(data, "dayHour"),
           orderCount: _.map(data, "amount"),
           orderCount: _.map(data, "amount"),
           totalAmount: _.map(data, "amount"),
           totalAmount: _.map(data, "amount"),
           orderCountY: _.map(data, "beforeAmount"),
           orderCountY: _.map(data, "beforeAmount"),
@@ -199,15 +191,8 @@ export default {
       });
       });
 
 
       await service.get("v2/rs/sale/hoursDau", {}).then(ret => {
       await service.get("v2/rs/sale/hoursDau", {}).then(ret => {
-        _.each(ret.today, (item, key) => {
-          item.lineTime = item.dayHour;
-        });
-
-        _.each(ret.yesterday, (item, key) => {
-        });
-
         let data = {
         let data = {
-          lineTime: _.map(ret.today, "lineTime"),
+          lineTime: _.map(ret.today, "dayHour"),
           orderCount: _.map(ret.today, "uv"),
           orderCount: _.map(ret.today, "uv"),
           orderCountY: _.map(ret.yesterday, "uv")
           orderCountY: _.map(ret.yesterday, "uv")
         };
         };

@@ -253,13 +253,13 @@ export default {
           }
           }
         },
         },
         legend: {
         legend: {
-          data: ["一级", "二级*三级", "四级"],
+          data: ["一级", "二级", "三级", "四级"],
           x: "right",
           x: "right",
           textStyle: {
           textStyle: {
             color: "#fff"
             color: "#fff"
           }
           }
         },
         },
-        color: ["#ffc107", "#009688", "#2196f3"],
+        color: ["#ffc107", "#009688", "#2196f3", "#fff"],
         xAxis: [
         xAxis: [
           {
           {
             type: "category",
             type: "category",
@@ -347,7 +347,7 @@ export default {
             }
             }
           },
           },
           {
           {
-            name: "二级*三级",
+            name: "二级",
             type: "line",
             type: "line",
             data: opt.t2,
             data: opt.t2,
             itemStyle: {
             itemStyle: {
@@ -369,9 +369,31 @@ export default {
             }
             }
           },
           },
           {
           {
+            name: "三级",
+            type: "line",
+            data: opt.t3,
+            itemStyle: {
+              normal: {
+                label: {
+                  show: true,
+                  position: "top",
+                  formatter: function(p) {
+                    return p.value.toFixed(opt.v);
+                  },
+                  textStyle: {
+                    color: "#fff"
+                  }
+                },
+                lineStyle: {
+                  width: 1
+                }
+              }
+            }
+          },
+          {
             name: "四级",
             name: "四级",
             type: "line",
             type: "line",
-            data: opt.t,
+            data: opt.t4,
             itemStyle: {
             itemStyle: {
               normal: {
               normal: {
                 label: {
                 label: {
@@ -410,23 +432,29 @@ export default {
           oby = _.map(ret.yesterday, i => {
           oby = _.map(ret.yesterday, i => {
             return (i.paymentCount / i.dau) * 100;
             return (i.paymentCount / i.dau) * 100;
           }),
           }),
-          oc4 = _.map(ret2.today, i => {
-            if (!i.clickPayCount) {
-              return 0;
-            }
-            return (i.paymentCount / i.clickPayCount) * 100;
-          }),
           oc1 = _.map(ret2.today, i => {
           oc1 = _.map(ret2.today, i => {
             if (!i.dau) {
             if (!i.dau) {
               return 0;
               return 0;
             }
             }
             return (i.infoUv / i.dau) * 100;
             return (i.infoUv / i.dau) * 100;
           }),
           }),
-          oc23 = _.map(ret2.today, i => {
+          oc2 = _.map(ret2.today, i => {
             if (!i.infoUv) {
             if (!i.infoUv) {
               return 0;
               return 0;
             }
             }
-            return (i.orderCount / i.infoUv) * 100;
+            return (i.addcartUv / i.infoUv) * 100;
+          }),
+          oc3 = _.map(ret2.today, i => {
+            if (!i.addcartUv) {
+              return 0;
+            }
+            return (i.orderCount / i.addcartUv) * 100;
+          }),
+          oc4 = _.map(ret2.today, i => {
+            if (!i.clickPayCount) {
+              return 0;
+            }
+            return (i.paymentCount / i.clickPayCount) * 100;
           }),
           }),
           times = _.map(ret.today, i =>
           times = _.map(ret.today, i =>
             (i.dayHour + "").substring((i.dayHour + "").length - 2)
             (i.dayHour + "").substring((i.dayHour + "").length - 2)
@@ -466,11 +494,12 @@ export default {
           title: "",
           title: "",
           chartName: ocChart,
           chartName: ocChart,
           t1: oc1,
           t1: oc1,
-          t2: oc23,
-          t: oc4,
+          t2: oc2,
+          t3: oc3,
+          t4: oc4,
           timeLine: days,
           timeLine: days,
           min: 0,
           min: 0,
-          max: _.max([...oc1, ...oc23, ...oc4]),
+          max: _.max([...oc1, ...oc2, ...oc3, ...oc4]),
           color: "#009688",
           color: "#009688",
           v: 0,
           v: 0,
           isRound: true
           isRound: true