From 6766c89be7cfe5061e635eeea30c994b96cd20e7 Mon Sep 17 00:00:00 2001
From: liuyongli <1598631486@qq.com>
Date: Thu, 21 Jul 2022 16:42:12 +0800
Subject: [PATCH] lyl

---
 components/chartdisplay/index.js              |  3 +-
 components/chartdisplay/index.wxml            |  2 +-
 .../Salesranking/Vehicletype/Vehicletype.js   | 41 ++++++++-----------
 .../Salesranking/Vehicletype/Vehicletype.json |  3 +-
 .../Salesranking/Vehicletype/Vehicletype.wxml |  2 +-
 5 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/components/chartdisplay/index.js b/components/chartdisplay/index.js
index d3aa09f..1a1935e 100644
--- a/components/chartdisplay/index.js
+++ b/components/chartdisplay/index.js
@@ -5,8 +5,7 @@ const data2= [600,700,800,900,1000,1200,1300,1400,1500,1600,1700,1900,2000,2100,
 Component({
     data: {
         showChart: true,
-        brandOption: histogram(data,data2,[],'#0084FF',false)
-       ,
+        brandOption: histogram(data,data2,[],'#0084FF',false),
 
     },
     onShow() {
diff --git a/components/chartdisplay/index.wxml b/components/chartdisplay/index.wxml
index 1bc1c48..976b029 100644
--- a/components/chartdisplay/index.wxml
+++ b/components/chartdisplay/index.wxml
@@ -1,5 +1,5 @@
 <view>
     <view class="brand_tu">
-        <c-echars showChart="{{showChart}}" canvasId="brandbar-canvas" chartId="brandbar" chartOption="{{brandOption}}" height="100%"></c-echars>
+        <c-echars showChart="{{showChart}}" canvasId="chart-canvas" chartId="chartbar" chartOption="{{brandOption}}" height="100%"></c-echars>
     </view>
 </view>
\ No newline at end of file
diff --git a/pages/index/Salesranking/Vehicletype/Vehicletype.js b/pages/index/Salesranking/Vehicletype/Vehicletype.js
index 55708e7..6b0993e 100644
--- a/pages/index/Salesranking/Vehicletype/Vehicletype.js
+++ b/pages/index/Salesranking/Vehicletype/Vehicletype.js
@@ -5,7 +5,7 @@ const data =['12月','1月','2月','3月','4月','5月','6月']
 const dValue =[1500,1000,500,800,100,1000,300]
 const dColor=['#0084FF',]
 let iPageIndex = 1 // 当前第几页,0代表第一页 
-let iPageSize = 10 //每页显示多少数据
+let iPageSize = 20 //每页显示多少数据
 Component({
     data: {
         select:false,
@@ -46,36 +46,25 @@ Component({
                 duration: 300000
             })
             this.getAmount(sTimeType, sStartTime, sEndTime),
-            this.getTrend(sTimeType, sStartTime, sEndTime)
+            this.getTrend()
             setTimeout(() =>{
                 wx.hideToast();
             },500) 
            },
         getTrend(){
-             // 页面数据
-             let sTimeType = wx.getStorageSync("sTimeType") || 34;
-             let sStartTime = wx.getStorageSync("sStartTime") || '';
-             let sEndTime = wx.getStorageSync("sEndTime") || '';
-             let sSeriesName = wx.getStorageSync("sSeriesName") || '';
-             let sBrand = wx.getStorageSync('sBrand') || 34;
              app.globalData.request({
                 action: 'getCheZhuCarSeriesRankingHome',
                 sType:'Marketing',
-                sTimeType:sTimeType,
-                sStartTime:sStartTime,
-                sEndTime:sEndTime,
-                iPageIndex: iPageIndex,
-                iPageSize: iPageSize,
-                sBrand: sBrand,
-                sSeriesName:sSeriesName,
-                sSpec:'a00',
-                sPriceType:'1',
-                sEnergyType:'1'
+                sStartTime: "2021-10",
+                sEndTime:"2021-10",
+                iPageIndex: "iPageIndex",
+                iPageSize: "iPageSize",
+                // sSpec:wx.getStorageSync('sSpec') || '',
+                // sPriceType:wx.getStorageSync('sPriceType') || '',
+                // sEnergyType:wx.getStorageSync('sEnergyType') || ''
              }).then(res => {
-                    const data = res;
-                    const rinking = data.rinking || [];
                     let arr = []
-                    rinking.forEach(ele =>{
+                    res.forEach(ele =>{
                         let ol = {
                             media:ele.seriesname,
                             volume:ele.salescount,
@@ -86,7 +75,7 @@ Component({
                     this.setData({
                         ranking:arr
                     })
-                    console.log(arr)
+                    console.log(res)
                 })
     }, 
         getAmount(sTimeType, sStartTime, sEndTime){
@@ -186,6 +175,7 @@ Component({
             }) 
             var name=e.currentTarget.dataset.name.name
             var value=e.currentTarget.dataset.name.value
+            wx.setStorageSync('sSpec',value)
             console.log(value)
             this.setData({
                 grade_name1:name,
@@ -205,6 +195,7 @@ Component({
             }) 
             var name=e.currentTarget.dataset.name.name
             var value=e.currentTarget.dataset.name.value
+            wx.setStorageSync('sPriceType',value)
 
             this.setData({
                 grade_name2:name,
@@ -223,6 +214,8 @@ Component({
             }) 
             console.log(e)
             var name=e.currentTarget.dataset.name
+            var value=e.currentTarget.dataset.name.value
+            wx.setStorageSync('sEnergyType',value)
             this.setData({
                 grade_name3:name,
                 select3:false
@@ -238,11 +231,11 @@ Component({
                 icon: 'loading',
                 duration: 300000
             }) 
-            console.log(e)
             var name=e.currentTarget.dataset.name
             this.setData({
                 grade_name4:name,
-                select4:false
+                select4:false,
+                a:name!="列表展示"
             })
             setTimeout(() =>{
                 wx.hideToast();
diff --git a/pages/index/Salesranking/Vehicletype/Vehicletype.json b/pages/index/Salesranking/Vehicletype/Vehicletype.json
index fe5f69f..dc37eb5 100644
--- a/pages/index/Salesranking/Vehicletype/Vehicletype.json
+++ b/pages/index/Salesranking/Vehicletype/Vehicletype.json
@@ -1,6 +1,7 @@
 {
     "usingComponents": {
-        "c-echars": "/components/c-echars/index"
+        "c-echars": "/components/c-echars/index",
+        "chart-display":"/components/chartdisplay/index"
     },
     "component": true
 }
\ No newline at end of file
diff --git a/pages/index/Salesranking/Vehicletype/Vehicletype.wxml b/pages/index/Salesranking/Vehicletype/Vehicletype.wxml
index 6128ac3..b75bed3 100644
--- a/pages/index/Salesranking/Vehicletype/Vehicletype.wxml
+++ b/pages/index/Salesranking/Vehicletype/Vehicletype.wxml
@@ -70,7 +70,7 @@
         </view>
     </scroll-view>
     <view class="list">
-        <view class="list_event" wx:if="{{item.value1===1}}">
+        <view class="list_event" wx:if="{{a}}">
             <view class="text">销量排行榜</view>
             <chart-display></chart-display>
         </view>