first commit

miniprogram/pages/channelAdvertising/components/shiduan/F2.ts

@@ -10,8 +10,8 @@ namespace shiduan {
       if (chartCatch.toufangfenxiChart === undefined) return
       chartCatch.toufangfenxiChart.clear()
       let { before, now } = this.data.DayList;
-      let beforeString = before.length ? `${before[0].dt}至${before[before.length - 1].dt}` : "";
-      let nowString = now.length ? `${now[0].dt}至${now[now.length - 1].dt}` : "";
+      let beforeString = before.length ? `${before[0].dts}至${before[0].dte}` : "";
+      let nowString = now.length ? `${now[0].dts}至${now[0].dte}` : "";
       before = before.map((v: any, i: number) => {
         v.index = i;
         v.dataKeyTypt = beforeString;
@@ -30,16 +30,19 @@ namespace shiduan {
       });
       chartCatch.toufangfenxiChart.source(data);
       chartCatch.toufangfenxiChart.scale('index', {
-        tickCount: 3
+        tickCount: 6
       });
-      chartCatch.toufangfenxiChart.axis('index', {
+          chartCatch.toufangfenxiChart.axis('index', {
         label: (text: string, index: number, total: number) => {
           let align = 'center';
           if (index === 0) align = 'left';
           if (index === total - 1) align = 'right';
+          let hour :string|number = Number(data[Number(text)].hour)
+          if(hour >= 24) hour = '24';
+          else hour = data[Number(text)].hour
           return {
             textAlign: align,
-            text: data[Number(text)].dt
+            text: hour
           }
         }
       });
@@ -58,8 +61,8 @@ namespace shiduan {
           const { tooltip: { title } } = ev;
           let index = Number(title || 0);
           index < 0 ? index = 0 : "";
-          items[0].name = data[index].dt;
-          items[1].name = data[index + this.data.DayList.before.length].dt;
+          items[0].name = data[index].hour;
+          items[1].name = data[index + this.data.DayList.before.length].hour;
           items[0].value = formmaterValueZhou(items[0].value, 2);
           items[1].value = formmaterValueZhou(items[1].value, 2);
         }
@@ -76,8 +79,8 @@ namespace shiduan {
       config.height = sys.windowWidth / 16 * 9;
       chartCatch.toufangfenxiChart = new F2.Chart(config);
       let { before, now } = this.data.DayList;
-      let beforeString = before.length ? `${before[0].dt}至${before[before.length - 1].dt}` : "";
-      let nowString = now.length ? `${now[0].dt}至${now[now.length - 1].dt}` : "";
+      let beforeString = before.length ? `${before[0].dts}至${before[0].dte}` : "";
+      let nowString = now.length ? `${now[0].dts}至${now[0].dte}` : "";
       before = before.map((v: any, i: number) => {
         v.index = i;
         v.dataKeyTypt = beforeString;
@@ -127,8 +130,8 @@ namespace shiduan {
           const { tooltip: { title } } = ev;
           let index = Number(title || 0);
           index < 0 ? index = 0 : "";
-          items[0].name = data[index].dt;
-          items[1].name = data[index + this.data.DayList.before.length].dt;
+          items[0].name = data[index].hour;
+          items[1].name = data[index + this.data.DayList.before.length].hour;
           items[0].value = formmaterValueZhou(items[0].value, 2);
           items[1].value = formmaterValueZhou(items[1].value, 2);
         }

miniprogram/pages/industryAdvertising/components/hangyejiegou/F2.ts

@@ -35,12 +35,12 @@ namespace hangyejiegou {
       chartCatch.toufangfenxiChart.tooltip(false);
       chartCatch.toufangfenxiChart.coord('polar', {
         transposed: true,
-        radius: 0.85
+        radius: 1
       });
       chartCatch.toufangfenxiChart.axis(false);
       chartCatch.toufangfenxiChart.interval()
         .position('type*p')
-        .color('name', ['#1890FF', '#13C2C2', '#2FC25B', '#FACC14', '#F04864', '#8543E0']);
+        .color('name', ['#1890FF', '#13C2C2', '#2FC25B', '#FACC14', '#F04864', '#8543E0']).adjust('stack');
 
       chartCatch.toufangfenxiChart.render();
     },

miniprogram/pages/industryAdvertising/components/hangyejiegou/F21.ts

@@ -35,12 +35,12 @@ namespace hangyejiegou {
       chartCatch.toufangfenxiChart.tooltip(false);
       chartCatch.toufangfenxiChart.coord('polar', {
         transposed: true,
-        radius: 0.85
+        radius: 1
       });
       chartCatch.toufangfenxiChart.axis(false);
       chartCatch.toufangfenxiChart.interval()
         .position('type*p')
-        .color('name', ['#1890FF', '#13C2C2', '#2FC25B', '#FACC14', '#F04864', '#8543E0']);
+        .color('name', ['#1890FF', '#13C2C2', '#2FC25B', '#FACC14', '#F04864', '#8543E0']).adjust('stack');
 
       chartCatch.toufangfenxiChart.render();
     },

miniprogram/pages/industryAdvertising/components/quanpanqushi/F2.ts

@@ -41,7 +41,7 @@ namespace quanpanqushi {
           if (index === total - 1) align = 'right';
           return {
             textAlign: align,
-            text: data[index].name
+            text: data[Number(text)].name
           }
         }
       });
@@ -109,7 +109,7 @@ namespace quanpanqushi {
           if (index === total - 1) align = 'right';
           return {
             textAlign: align,
-            text: data[index].name
+            text: data[Number(text)].name
           }
         }
       });
@@ -136,6 +136,7 @@ namespace quanpanqushi {
           }
         }
       });
+      console.log(data, key)
       chartCatch.toufangfenxiChart.line().position('index*' + key).shape('smooth').color("dataKeyTypt", ["#1b9ade", "#fd5555"]);
       chartCatch.toufangfenxiChart.render();
       return chartCatch.toufangfenxiChart;

miniprogram/pages/industryAdvertising/components/quanpanqushi/F21.ts

@@ -41,7 +41,7 @@ namespace quanpanqushi {
           if (index === total - 1) align = 'right';
           return {
             textAlign: align,
-            text: data[index].name
+            text: data[Number(text)].name
           }
         }
       });
@@ -109,7 +109,7 @@ namespace quanpanqushi {
           if (index === total - 1) align = 'right';
           return {
             textAlign: align,
-            text: data[index].name
+            text: data[Number(text)].name
           }
         }
       });

miniprogram/pages/industryAdvertising/components/quanpanqushi/index.ts

@@ -105,7 +105,7 @@ namespace quanpanqushi {
             v.linkType === beforeKey ? list.before.push(v) : list.now.push(v)
           }
 
-          
+
           let li1 = res[1] || []
           let list1: adDay = {
             before: [],
@@ -145,7 +145,7 @@ namespace quanpanqushi {
           }
           this.setData({
             DayList: list,
-          },()=>{
+          }, () => {
             upLine.bind(this)()
           })
         })
@@ -170,7 +170,7 @@ namespace quanpanqushi {
           }
           this.setData({
             DayList1: list,
-          },()=>{
+          }, () => {
             upLine1.bind(this)()
           })
         })

miniprogram/pages/industryAdvertising/components/quanpanqushi/index.wxml

@@ -5,7 +5,7 @@
 <view >
   <text class="title">硬广趋势</text>
   <view class="btns">
-    <picker mode="selector" bindchange="channelChange" range-key="text" value="{{select_act}}" range="{{select}}">
+    <picker style="height: 40px;line-height: 40px;" mode="selector" bindchange="channelChange" range-key="text" value="{{select_act}}" range="{{select}}">
       <view class="select">
         {{select[select_act].text || "请选择"}}
         <van-icon name="arrow-down" />