diff --git a/components/option/pictographicOption.js b/components/option/pictographicOption.js index 23cc9f2..1cd2c34 100644 --- a/components/option/pictographicOption.js +++ b/components/option/pictographicOption.js @@ -1,5 +1,11 @@ // 象形 export default function pictographicOption(dRegion = [], dValue = [], dSum = 0) { + if(dRegion.length < 5) { + let n = 5 - dRegion.length; + for(let i = 0; i < n; i++) { + dRegion.push('') + } + } return { tooltip: { trigger: "axis", diff --git a/components/option/pictographicOption2.js b/components/option/pictographicOption2.js index c3d14c6..fa90a9a 100644 --- a/components/option/pictographicOption2.js +++ b/components/option/pictographicOption2.js @@ -1,5 +1,11 @@ // 象形 export default function pictographicOption(dRegion = [], dValue = [], dSum = 0) { + if(dRegion.length < 5) { + let n = 5 - dRegion.length; + for(let i = 0; i < n; i++) { + dRegion.push('') + } + } return { textStyle: { diff --git a/components/option/singleLineOption.js b/components/option/singleLineOption.js index 435a9f2..47b04aa 100644 --- a/components/option/singleLineOption.js +++ b/components/option/singleLineOption.js @@ -4,6 +4,7 @@ export default function brokenLine(dValue = [], dx = []) { grid: { left: 40, top: 25, + bottom: 25, height: 150, width: 320 }, diff --git a/contrastPackages/carModelsRatio/weibo/index.wxml b/contrastPackages/carModelsRatio/weibo/index.wxml index 07efce9..b15e92f 100644 --- a/contrastPackages/carModelsRatio/weibo/index.wxml +++ b/contrastPackages/carModelsRatio/weibo/index.wxml @@ -95,12 +95,12 @@ - {{item.name}} - - + {{item.name}} + + - + diff --git a/contrastPackages/carModelsRatio/weibo/index.wxss b/contrastPackages/carModelsRatio/weibo/index.wxss index a0d4725..2c39c5c 100644 --- a/contrastPackages/carModelsRatio/weibo/index.wxss +++ b/contrastPackages/carModelsRatio/weibo/index.wxss @@ -1,7 +1,7 @@ .chart_box{ margin-top: 24rpx; width: 686rpx; - height: 486rpx; + height: 400rpx; padding-top:32rpx ; background: white; } @@ -72,8 +72,8 @@ .area_box{ margin-top: 24rpx; width: 686rpx; - height: 970rpx; + height: 880rpx; background:#ffffff; border-radius: 8rpx; - padding-top:32rpx; + padding:32rpx 0; } \ No newline at end of file diff --git a/pages/index/Salesranking/Salesranking.js b/pages/index/Salesranking/Salesranking.js index d1267e5..b0f88e1 100644 --- a/pages/index/Salesranking/Salesranking.js +++ b/pages/index/Salesranking/Salesranking.js @@ -354,6 +354,11 @@ Page({ }) }) }, + onClose(){ + this.setData({ + show: false + }) + }, exit() { this.setData({ show: false diff --git a/pages/index/Salesranking/Salesranking.wxml b/pages/index/Salesranking/Salesranking.wxml index bc56079..7b31460 100644 --- a/pages/index/Salesranking/Salesranking.wxml +++ b/pages/index/Salesranking/Salesranking.wxml @@ -93,7 +93,7 @@ - + 销量趋势 diff --git a/pages/index/Salesranking/Salesranking.wxss b/pages/index/Salesranking/Salesranking.wxss index 596b4c2..58b8472 100644 --- a/pages/index/Salesranking/Salesranking.wxss +++ b/pages/index/Salesranking/Salesranking.wxss @@ -206,7 +206,7 @@ .brand_tu { /* position: relative; */ width: 100%; - height: 390rpx; + height: 420rpx; text-align: center; } diff --git a/pages/insight/pages/brandInsight/brandDataList/index.js b/pages/insight/pages/brandInsight/brandDataList/index.js index 1ee8936..d327d1f 100644 --- a/pages/insight/pages/brandInsight/brandDataList/index.js +++ b/pages/insight/pages/brandInsight/brandDataList/index.js @@ -272,7 +272,7 @@ Page({ success: function (r) { if (r.confirm) { that.setData({ - fileName: "事件数据" + date, + fileName: wx.getStorageSync('sBrand') + date, reportShow: true }) } else { @@ -282,7 +282,7 @@ Page({ }) } else { that.setData({ - fileName: "事件数据" + date, + fileName: wx.getStorageSync('sBrand') + date, reportShow: true }) } diff --git a/pages/insight/pages/modalInsight/modalDataList/index.js b/pages/insight/pages/modalInsight/modalDataList/index.js index e57bd85..d6180e0 100644 --- a/pages/insight/pages/modalInsight/modalDataList/index.js +++ b/pages/insight/pages/modalInsight/modalDataList/index.js @@ -96,7 +96,7 @@ Page({ iTimeType: this.data.iTimeType, //0发布时间 1入库时间 sCrisis: wjList.join(',') || '', sBrand: wx.getStorageSync('sBrand') || '', - sSeries: wx.getStorageSync('sSeriesName') || '', + sSeriesName: wx.getStorageSync('sSeriesName') || '', }).then(res => { let arr = [...this.data.brandDataList, ...res] this.setData({ @@ -138,7 +138,7 @@ Page({ iTimeType: this.data.iTimeType, //0发布时间 1入库时间 sCrisis: wjList.join(',') || '', sBrand: wx.getStorageSync('sBrand') || '', - sSeries: wx.getStorageSync('sSeriesName') || '', + sSeriesName: wx.getStorageSync('sSeriesName') || '', }, (res) => { this.setData({ total: res.totalNum @@ -270,7 +270,7 @@ Page({ success: function (r) { if (r.confirm) { that.setData({ - fileName: "事件数据" + date, + fileName: wx.getStorageSync('sSeriesName') + date, reportShow: true }) } else { @@ -280,7 +280,7 @@ Page({ }) } else { that.setData({ - fileName: "事件数据" + date, + fileName:wx.getStorageSync('sSeriesName') + date, reportShow: true }) } @@ -327,7 +327,7 @@ Page({ sStartTime: this.data.sStartTime, sEndTime: this.data.sEndTime, sBrand: wx.getStorageSync('sBrand') || '', - sSeries: wx.getStorageSync('sSeriesName') || '', + sSeriesName: wx.getStorageSync('sSeriesName') || '', sQuDao: qdList.join(',') || '', sQingGan: qgList.join(',') || '', sCrisis: wjList.join(',') || '', diff --git a/pages/insight/pages/themeBoard/index.wxml b/pages/insight/pages/themeBoard/index.wxml index 33d2014..e58a6fc 100644 --- a/pages/insight/pages/themeBoard/index.wxml +++ b/pages/insight/pages/themeBoard/index.wxml @@ -210,7 +210,7 @@ 大V分析 - + diff --git a/pages/insight/pages/themeList/index.js b/pages/insight/pages/themeList/index.js index 399975c..1423342 100644 --- a/pages/insight/pages/themeList/index.js +++ b/pages/insight/pages/themeList/index.js @@ -370,7 +370,7 @@ Page({ success: function (r) { if (r.confirm) { that.setData({ - fileName: "事件数据" + date, + fileName: "主题数据" + date, reportShow: true }) } else { @@ -380,7 +380,7 @@ Page({ }) } else { that.setData({ - fileName: "事件数据" + date, + fileName: "主题数据" + date, reportShow: true }) }