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 @@
-
+
\ No newline at end of file
diff --git a/pages/index/Salesranking/Vehicletype/Vehicletype.js b/pages/index/Salesranking/Vehicletype/Vehicletype.js
index de8b747..1589a01 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,27 +46,26 @@ Component({
duration: 300000
})
this.getAmount(sTimeType, sStartTime, sEndTime),
- this.getTrend(sTimeType, sStartTime, sEndTime)
+ this.getTrend()
setTimeout(() =>{
wx.hideToast();
},500)
},
getTrend(){
- // 页面数据
- let sStartTime = wx.getStorageSync("sStartTime") || '';
- let sEndTime = wx.getStorageSync("sEndTime") || '';
- let sBrand = wx.getStorageSync('sBrand') || '奥迪';
+
app.globalData.request({
action: 'getCheZhuCarSeriesRankingHome',
sType:'Marketing',
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,
@@ -77,7 +76,6 @@ Component({
this.setData({
ranking:arr
})
- console.log("品牌",res)
})
},
getAmount(sTimeType, sStartTime, sEndTime){
@@ -177,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,
@@ -196,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,
@@ -214,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
@@ -229,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 @@
-
+
销量排行榜