From a7d177937a67b902d571612e5b31eeeb58c1a475 Mon Sep 17 00:00:00 2001
From: wylyl22 <2373073266@qq.com>
Date: Wed, 13 Jul 2022 17:54:34 +0800
Subject: [PATCH] wyl

---
 components/indexCom/mediaChild/index.js   | 60 +++++++++++++++--------
 components/indexCom/mediaChild/index.wxml | 10 ++--
 components/option/sColumnarOption.js      |  2 +-
 project.private.config.json               |  7 +++
 4 files changed, 51 insertions(+), 28 deletions(-)

diff --git a/components/indexCom/mediaChild/index.js b/components/indexCom/mediaChild/index.js
index c846a16..06791c1 100644
--- a/components/indexCom/mediaChild/index.js
+++ b/components/indexCom/mediaChild/index.js
@@ -6,31 +6,49 @@ Component({
     },
     lifetimes: {
         attached() {
-            app.globalData.request({action: 'getWebsiteHome0528', sType: 'Home', sTimeType: 34}).then(res => {
-                const arr=[]
-                let data=JSON.stringify(res)
-                let data2=JSON.parse(data)
-                for (let index = 0; index < 10; index++) {
-                    let obj={
-                        name:data2.key,
-                        value:data2.value
+            let sTimeType = wx.getStorageSync("sTimeType") || 34;
+            let sStartTime = wx.getStorageSync("sStartTime") || '';
+            let sEndTime = wx.getStorageSync("sEndTime") || '';
+            this.getData(sTimeType, sStartTime, sEndTime);
+        },
+    },
+    methods: {
+        changeTime(e){
+            let sTimeType = e.detail.sTimeType;
+            let sStartTime = e.detail.sStartTime;
+            let sEndTime = e.detail.sEndTime;
+            this.getData(sTimeType, sStartTime, sEndTime);
+        },
+        getData(sTimeType, sStartTime, sEndTime) {
+            wx.showToast({
+                title: '加载中',
+                icon: 'loading',
+                duration: 300000
+            }) 
+            let obj = {
+                action: 'getWebsiteHome0528',
+                sType: 'Home',
+                sTimeType: sTimeType,
+                sStartTime: sStartTime,
+                sEndTime: sEndTime
+            }
+            app.globalData.request(obj).then(res => {
+                const obj = res
+                const arr = []
+                Object.keys(obj).forEach(ele => {
+                    let o1 = {
+                        name: ele,
+                        value: obj[ele]
                     }
-                    arr.push(obj)  
-                } 
-                // for (let index = 0; index < 10; index++) {       
-                // }
+                    arr.push(o1);
+                })
                 this.setData({
-                    // countYear: data.count_year,
-                    // count6month: data.count_6month,
-                    // countAll: data.count_all,
                     ranking: arr
                 })
+                setTimeout(() =>{
+                    wx.hideToast();
+                },500)
             })
-        },
-    },
-    methods: {
-        a(){
-            console.log('111',this.arr)
-        },
+        }
     }
 })
\ No newline at end of file
diff --git a/components/indexCom/mediaChild/index.wxml b/components/indexCom/mediaChild/index.wxml
index b8b9719..c08f5bf 100644
--- a/components/indexCom/mediaChild/index.wxml
+++ b/components/indexCom/mediaChild/index.wxml
@@ -1,6 +1,6 @@
 <view>
 <!-- 时间组件 -->
-<time-component></time-component>
+<time-component bindchange="changeTime"></time-component>
     <view class="list_event">
         <view class="event_title" bindtap="a">传播重点媒体排行</view>
         <view class="ranking">
@@ -9,17 +9,15 @@
             <view class="title2">传播量</view>
         </view>
         <view>
-        <view class="rank" wx:for="{{ranking}}" wx:key="idx">
-
+        <view class="rank" wx:for="{{ranking}}" wx:key="index" wx:if="{{index<10}}" >
             <view class="dis_image">
                 <image class="rank_num" wx:if="{{index === 0}}" src="{{imageUrl}}/img_diyi.png"></image>
                 <image class="rank_num" wx:if="{{index === 1}}" src="{{imageUrl}}/img_dier.png"></image>
                 <image class="rank_num" wx:if="{{index === 2}}" src="{{imageUrl}}/img_disan.png"></image>
                 <view class="num" wx:if="{{index !== 0 &&index !== 1 &&index !== 2 }}">{{index >= 9 ? index + 1 : '0' + (index + 1)}}</view>
             </view>
-            <view class="media">{{item}}</view>
-
-            <view class="volume">{{idx}}</view>
+            <view class="media">{{item.name}}</view>
+            <view class="volume">{{item.value}}</view>
         </view>
         </view>
     </view>
diff --git a/components/option/sColumnarOption.js b/components/option/sColumnarOption.js
index 09ede69..0a5da2d 100644
--- a/components/option/sColumnarOption.js
+++ b/components/option/sColumnarOption.js
@@ -102,7 +102,7 @@ function columar(data=[],ds=[],color2=[]){
     //       }
     // })  : 
     list.push({
-        name: data[i],
+        name: data[i].name,
         type: 'bar',
         barWidth : 24,
         data: ds[i],
diff --git a/project.private.config.json b/project.private.config.json
index 8382fd0..af34138 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -8,6 +8,13 @@
     "condition": {
         "miniprogram": {
             "list": [
+                {
+                    "name": "",
+                    "pathName": "pages/index/Salesranking/Vehicletype/Vehicletype",
+                    "query": "",
+                    "launchMode": "default",
+                    "scene": null
+                },
                 {
                     "name": "",
                     "pathName": "pages/index/Salesranking/Vehicletype/Vehicletype",