diff --git a/contrastPackages/addTheme/index.js b/contrastPackages/addTheme/index.js index ee81263..e113cf9 100644 --- a/contrastPackages/addTheme/index.js +++ b/contrastPackages/addTheme/index.js @@ -100,7 +100,7 @@ Page({ app.globalData.request({ action: 'getSchemeDataToTheme', token: wx.getStorageSync('token'), - sType: 'now' + sType: 'contrast' }).then(res => { for (let i of themeData) { if (i) { diff --git a/pages/index/Salesranking/Salesranking.js b/pages/index/Salesranking/Salesranking.js index 975a354..5400307 100644 --- a/pages/index/Salesranking/Salesranking.js +++ b/pages/index/Salesranking/Salesranking.js @@ -104,6 +104,13 @@ Page({ this.setData({ranking: [], endDate: this.data.dateList[0], startDate: this.data.dateList[2], currentDate: '近3个月'}) } else if(value == 'past6') { this.setData({ranking: [], endDate: this.data.dateList[0], startDate: this.data.dateList[5], currentDate: '近6个月'}) + } else if(value == 'thisyear') { + let start = new Date(this.data.dateList[0]).getFullYear() + '-01'; + this.setData({ranking: [], endDate: this.data.dateList[0], startDate: start, currentDate: '今年'}) + } else if(value == 'lastyear') { + let start = (new Date(this.data.dateList[0]).getFullYear() - 1) + '-01'; + let end = (new Date(this.data.dateList[0]).getFullYear() - 1) + '-12'; + this.setData({ranking: [], endDate: end, startDate: start, currentDate: '去年'}) } this.getTrend(); }, diff --git a/pages/index/Salesranking/Salesranking.wxml b/pages/index/Salesranking/Salesranking.wxml index 2d3514d..ea50f34 100644 --- a/pages/index/Salesranking/Salesranking.wxml +++ b/pages/index/Salesranking/Salesranking.wxml @@ -27,6 +27,14 @@ 近6个月 近6个月 + + 今年 + 今年 + + + 去年 + 去年 + diff --git a/pages/varComm/pages/event/index.wxml b/pages/varComm/pages/event/index.wxml index f2a11cf..7f582e5 100644 --- a/pages/varComm/pages/event/index.wxml +++ b/pages/varComm/pages/event/index.wxml @@ -2,7 +2,7 @@ - + diff --git a/pages/varComm/pages/theme/index.js b/pages/varComm/pages/theme/index.js index a667cf7..c421473 100644 --- a/pages/varComm/pages/theme/index.js +++ b/pages/varComm/pages/theme/index.js @@ -99,6 +99,11 @@ Component({ lifetimes: { attached() { let x=wx.getStorageSync('themeData') + let arr = []; + x.forEach(ele => { + arr.push(JSON.stringify(ele)) + }); + this.setData({result: arr}) if(wx.getStorageSync('themeData')){ let result = x.map(ele=>{ return JSON.stringify(ele) diff --git a/pages/varComm/pages/theme/index.wxml b/pages/varComm/pages/theme/index.wxml index 0cd8c30..3de389c 100644 --- a/pages/varComm/pages/theme/index.wxml +++ b/pages/varComm/pages/theme/index.wxml @@ -3,7 +3,7 @@ - +