first commit

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

@@ -1,4 +1,4 @@
-namespace zhongdiankehu {
+namespace fenzhongdiankehu {
   let { getImportantCustomer } = require('../../../../utils/api')
   let first = true;
   Component({
@@ -12,6 +12,9 @@ namespace zhongdiankehu {
       channel: {
         type: Object
       },
+      isshow: {
+        type: Boolean
+      }
     },
     observers: {
       'array': function () {
@@ -112,7 +115,8 @@ namespace zhongdiankehu {
           select_act: Number(event.detail.value)
         }, () => this.upData())
       },
-    }
+    },
+
   })
 }
 

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

@@ -87,6 +87,9 @@ namespace hangyejiegou {
 
       chartCatch.toufangfenxiChart.render();
       return chartCatch.toufangfenxiChart;
-    }
+    },
+    clearchart(){
+      if (chartCatch.toufangfenxiChart !== undefined) chartCatch.toufangfenxiChart.destroy(), chartCatch.toufangfenxiChart = undefined;
+    }    
   };
 }

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

@@ -87,6 +87,9 @@ namespace hangyejiegou {
 
       chartCatch.toufangfenxiChart.render();
       return chartCatch.toufangfenxiChart;
+    },
+    clearchart1(){
+      if (chartCatch.toufangfenxiChart !== undefined) chartCatch.toufangfenxiChart.destroy(), chartCatch.toufangfenxiChart = undefined;
     }
   };
 }

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

@@ -1,7 +1,7 @@
 
 namespace hangyejiegou {
-  const { line, upLine } = require("./F2");
-  const { line1, upLine1 } = require("./F21");
+  const { line, upLine, clearchart } = require("./F2");
+  const { line1, upLine1, clearchart1 } = require("./F21");
   let { getMarket } = require('../../../../utils/api')
   let first = true;
   Component({
@@ -29,6 +29,11 @@ namespace hangyejiegou {
       this.init();
       first = false;
     },
+    detached: function() {
+      // 在组件实例被从页面节点树移除时执行
+      clearchart()
+      clearchart1()
+    },
 
     /**
      * 组件的初始数据

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

@@ -140,6 +140,9 @@ namespace hangyetoufang {
       chartCatch.toufangfenxiChart.line().position('index*' + key).shape('smooth').color("dataKeyTypt", ["#1b9ade", "#fd5555"]);
       chartCatch.toufangfenxiChart.render();
       return chartCatch.toufangfenxiChart;
+    },
+    clearchart(){
+      if (chartCatch.toufangfenxiChart !== undefined) chartCatch.toufangfenxiChart.destroy(), chartCatch.toufangfenxiChart = undefined;
     }
   };
 }

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

@@ -139,6 +139,9 @@ namespace hangyetoufang {
       chartCatch.toufangfenxiChart.line().position('index*' + key).shape('smooth').color("dataKeyTypt", ["#1b9ade", "#fd5555"]);
       chartCatch.toufangfenxiChart.render();
       return chartCatch.toufangfenxiChart;
+    },
+    clearchart1(){
+      if (chartCatch.toufangfenxiChart !== undefined) chartCatch.toufangfenxiChart.destroy(), chartCatch.toufangfenxiChart = undefined;
     }
   };
 }

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

@@ -1,7 +1,7 @@
 namespace hangyetoufang {
-  const { line, upLine } = require("./F2");
-  const { line1, upLine1 } = require("./F21");
-  let { getTrendHard,getTrendSoft,getMarket } = require('../../../../utils/api')
+  const { line, upLine,clearchart } = require("./F2");
+  const { line1, upLine1, clearchart1 } = require("./F21");
+  let { getTrendHard,getTrendSoft } = require('../../../../utils/api')
   let first = true;
   Component({
     /**
@@ -29,6 +29,11 @@ namespace hangyetoufang {
       this.init();
       first = false;
     },
+    detached: function() {
+      // 在组件实例被从页面节点树移除时执行
+      clearchart()
+      clearchart1()
+    },
 
     /**
      * 组件的初始数据

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

@@ -2,10 +2,10 @@
   <view class="after"></view>
   行业投放趋势
 </view>
-<view >
+<view  style="height: 40px;line-height: 40px;">
   <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" />
@@ -16,10 +16,10 @@
 <view style="height: 54.25vw;">
   <f2 wx:if="{{onInitChart !== undefined}}" onInit="{{onInitChart}}" />
 </view>
-<view >
+<view  style="height: 40px;line-height: 40px;">
   <text class="title">软广趋势</text>
   <view class="btns">
-    <picker mode="selector" bindchange="channelChange1" range-key="text" value="{{select_act1}}" range="{{select1}}">
+    <picker style="height: 40px;line-height: 40px;" mode="selector" bindchange="channelChange1" range-key="text" value="{{select_act1}}" range="{{select1}}">
       <view class="select">
         {{select1[select_act1].text || "请选择"}}
         <van-icon name="arrow-down" />

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

@@ -89,6 +89,9 @@ namespace hangyezhanbi {
         .color('midIndustryName').adjust('stack');
       chartCatch.toufangfenxiChart.render();
       return chartCatch.toufangfenxiChart;
+    },
+    clearchart(){
+      if (chartCatch.toufangfenxiChart !== undefined) chartCatch.toufangfenxiChart.destroy(), chartCatch.toufangfenxiChart = undefined;
     }
   };
 }

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

@@ -89,6 +89,9 @@ namespace hangyezhanbi {
         .color('midIndustryName').adjust('stack');
       chartCatch.toufangfenxiChart.render();
       return chartCatch.toufangfenxiChart;
+    },
+    clearchart1(){
+      if (chartCatch.toufangfenxiChart !== undefined) chartCatch.toufangfenxiChart.destroy(), chartCatch.toufangfenxiChart = undefined;
     }
   };
 }

miniprogram/pages/industryAdvertising/components/hangyezhanbi/F22.ts

@@ -89,6 +89,9 @@ namespace hangyezhanbi {
         .color('smallIndustryName').adjust('stack');
       chartCatch.toufangfenxiChart.render();
       return chartCatch.toufangfenxiChart;
+    },
+    clearchart2(){
+      if (chartCatch.toufangfenxiChart !== undefined) chartCatch.toufangfenxiChart.destroy(), chartCatch.toufangfenxiChart = undefined;
     }
   };
 }

miniprogram/pages/industryAdvertising/components/hangyezhanbi/F23.ts

@@ -89,6 +89,9 @@ namespace hangyezhanbi {
         .color('smallIndustryName').adjust('stack');
       chartCatch.toufangfenxiChart.render();
       return chartCatch.toufangfenxiChart;
+    },
+    clearchart3(){
+      if (chartCatch.toufangfenxiChart !== undefined) chartCatch.toufangfenxiChart.destroy(), chartCatch.toufangfenxiChart = undefined;
     }
   };
 }

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

@@ -1,8 +1,8 @@
 namespace hangyezhanbi {
-  const { line, upLine } = require("./F2");
-  const { line1, upLine1 } = require("./F21");
-  const { line2, upLine2 } = require("./F22");
-  const { line3, upLine3 } = require("./F23");
+  const { line, upLine,clearchart } = require("./F2");
+  const { line1, upLine1,clearchart1 } = require("./F21");
+  const { line2, upLine2,clearchart2 } = require("./F22");
+  const { line3, upLine3,clearchart3 } = require("./F23");
   let { getMSIndustryProportion } = require('../../../../utils/api')
   let first = true;
   Component({
@@ -30,6 +30,13 @@ namespace hangyezhanbi {
       first = false;
     },
 
+    detached: function() {
+      // 在组件实例被从页面节点树移除时执行
+      clearchart()
+      clearchart1()
+      clearchart2()
+      clearchart3()
+    },
     /**
      * 组件的初始数据
      */

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

@@ -1,6 +1,4 @@
-namespace ruanzhifenbu {
-  let { formmaterValueZhou } = require("../../../../utils/util")
-
+namespace jiemufenbu {
   const chartCatch: antvChart = {
     toufangfenxiChart: undefined
   }
@@ -113,6 +111,9 @@ namespace ruanzhifenbu {
         });
       chartCatch.toufangfenxiChart.render();
       return chartCatch.toufangfenxiChart;
+    },
+    clearchart(){
+      if (chartCatch.toufangfenxiChart !== undefined) chartCatch.toufangfenxiChart.destroy(), chartCatch.toufangfenxiChart = undefined;
     }
   };
 }

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

@@ -1,5 +1,5 @@
-namespace ruanzhifenbu  {
-  const { line, upLine } = require("./F2");
+namespace jiemufenbu  {
+  const { line, upLine,clearchart } = require("./F2");
   let { getProgramTypeDistribution } = require('../../../../utils/api')
   let first = true;
   Component({
@@ -27,6 +27,10 @@ namespace ruanzhifenbu  {
       first = false;
     },
 
+    detached: function() {
+      // 在组件实例被从页面节点树移除时执行
+      clearchart()
+    },
     /**
      * 组件的初始数据
      */

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

@@ -97,6 +97,9 @@ namespace pindaofenbu {
       chartCatch.toufangfenxiChart.interval().position('channelName*' + key).shape('smooth').color(["#1b9ade", "#fd5555"]);
       chartCatch.toufangfenxiChart.render();
       return chartCatch.toufangfenxiChart;
+    },
+    clearchart(){
+      if (chartCatch.toufangfenxiChart !== undefined) chartCatch.toufangfenxiChart.destroy(), chartCatch.toufangfenxiChart = undefined;
     }
   };
 }

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

@@ -97,6 +97,9 @@ namespace pindaofenbu {
       chartCatch.toufangfenxiChart.interval().position('channelName*' + key).shape('smooth').color(["#fd5555"]);
       chartCatch.toufangfenxiChart.render();
       return chartCatch.toufangfenxiChart;
+    },
+    clearchart1(){
+      if (chartCatch.toufangfenxiChart !== undefined) chartCatch.toufangfenxiChart.destroy(), chartCatch.toufangfenxiChart = undefined;
     }
   };
 }

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

@@ -1,6 +1,6 @@
 namespace pindaofenbu {
-  const { line, upLine } = require("./F2");
-  const { line1, upLine1 } = require("./F21");
+  const { line, upLine,clearchart } = require("./F2");
+  const { line1, upLine1,clearchart1 } = require("./F21");
   let { getChannelDistribution } = require('../../../../utils/api')
   let first = true;
   Component({
@@ -28,6 +28,11 @@ namespace pindaofenbu {
       first = false;
     },
 
+    detached: function() {
+      // 在组件实例被从页面节点树移除时执行
+      clearchart()
+      clearchart1()
+    },
     /**
      * 组件的初始数据
      */
@@ -112,6 +117,7 @@ namespace pindaofenbu {
             }),
           }, () => {
             upLine.bind(this)()
+            upLine1.bind(this)()
           })
         })
       },

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

@@ -140,6 +140,9 @@ namespace quanpanqushi {
       chartCatch.toufangfenxiChart.line().position('index*' + key).shape('smooth').color("dataKeyTypt", ["#1b9ade", "#fd5555"]);
       chartCatch.toufangfenxiChart.render();
       return chartCatch.toufangfenxiChart;
+    },
+    clearchart(){
+      if (chartCatch.toufangfenxiChart !== undefined) chartCatch.toufangfenxiChart.destroy(), chartCatch.toufangfenxiChart = undefined;
     }
   };
 }

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

@@ -139,6 +139,9 @@ namespace quanpanqushi {
       chartCatch.toufangfenxiChart.line().position('index*' + key).shape('smooth').color("dataKeyTypt", ["#1b9ade", "#fd5555"]);
       chartCatch.toufangfenxiChart.render();
       return chartCatch.toufangfenxiChart;
+    },
+    clearchart1(){
+      if (chartCatch.toufangfenxiChart !== undefined) chartCatch.toufangfenxiChart.destroy(), chartCatch.toufangfenxiChart = undefined;
     }
   };
 }

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

@@ -1,6 +1,6 @@
 namespace quanpanqushi {
-  const { line, upLine } = require("./F2");
-  const { line1, upLine1 } = require("./F21");
+  const { line, upLine,clearchart } = require("./F2");
+  const { line1, upLine1,clearchart1 } = require("./F21");
   let { getMarket } = require('../../../../utils/api')
   let first = true;
   Component({
@@ -30,6 +30,11 @@ namespace quanpanqushi {
       first = false;
     },
 
+    detached: function() {
+      // 在组件实例被从页面节点树移除时执行
+      clearchart()
+      clearchart1()
+    },
     /**
      * 组件的初始数据
      */

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

@@ -2,7 +2,7 @@
   <view class="after"></view>
   全盘趋势
 </view>
-<view >
+<view style="height: 40px;line-height: 40px;">
   <text class="title">硬广趋势</text>
   <view class="btns">
     <picker style="height: 40px;line-height: 40px;" mode="selector" bindchange="channelChange" range-key="text" value="{{select_act}}" range="{{select}}">

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

@@ -115,6 +115,9 @@ namespace ruanzhifenbu {
         });
       chartCatch.toufangfenxiChart.render();
       return chartCatch.toufangfenxiChart;
+    },
+    clearchart(){
+      if (chartCatch.toufangfenxiChart !== undefined) chartCatch.toufangfenxiChart.destroy(), chartCatch.toufangfenxiChart = undefined;
     }
   };
 }

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

@@ -1,5 +1,5 @@
 namespace ruanzhifenbu  {
-  const { line, upLine } = require("./F2");
+  const { line, upLine, clearchart } = require("./F2");
   let { getMarket } = require('../../../../utils/api')
   let first = true;
   Component({
@@ -27,6 +27,11 @@ namespace ruanzhifenbu  {
       first = false;
     },
 
+
+    detached: function() {
+      // 在组件实例被从页面节点树移除时执行
+      clearchart()
+    },
     /**
      * 组件的初始数据
      */

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

@@ -1,4 +1,4 @@
-namespace shiduan {
+namespace zhouzoushi {
 
   const { formmaterValueZhou } = require("../../../../utils/util")
 
@@ -138,6 +138,9 @@ namespace shiduan {
       });
       chartCatch.toufangfenxiChart.render();
       return chartCatch.toufangfenxiChart;
+    },
+    clearchart(){
+      if (chartCatch.toufangfenxiChart !== undefined) chartCatch.toufangfenxiChart.destroy(), chartCatch.toufangfenxiChart = undefined;
     }
   };
 

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

@@ -1,5 +1,5 @@
 namespace zhouzoushi  {
-  const { line, upLine } = require("./F2");
+  const { line, upLine, clearchart } = require("./F2");
   let { getLastWeekTrend } = require('../../../../utils/api')
   let first = true;
   Component({
@@ -27,6 +27,10 @@ namespace zhouzoushi  {
       first = false;
     },
 
+    detached: function() {
+      // 在组件实例被从页面节点树移除时执行
+      clearchart()
+    },
     /**
      * 组件的初始数据
      */