Merge branch 'dev' of git.oa00.com:xiaowen/swsWecat into dev

* 'dev' of git.oa00.com:xiaowen/swsWecat:
  zx
  zx

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) {

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();
     },

pages/index/Salesranking/Salesranking.wxml

@@ -27,6 +27,14 @@
                                                 <view data-value="past6" wx-if="{{currentDate == '近6个月'}}" class="more-item-active" style="width: 200rpx" bindtap="changePast">近6个月</view>
                                                 <view data-value="past6" wx-if="{{currentDate != '近6个月'}}" class="more-item" style="width: 200rpx" bindtap="changePast">近6个月</view>
                                             </view>
+                                            <view>
+                                                <view data-value="thisyear" wx-if="{{currentDate == '今年'}}" class="more-item-active" style="width: 200rpx" bindtap="changePast">今年</view>
+                                                <view data-value="thisyear" wx-if="{{currentDate != '今年'}}" class="more-item" style="width: 200rpx" bindtap="changePast">今年</view>
+                                            </view>
+                                            <view>
+                                                <view data-value="lastyear" wx-if="{{currentDate == '去年'}}" class="more-item-active" style="width: 200rpx" bindtap="changePast">去年</view>
+                                                <view data-value="lastyear" wx-if="{{currentDate != '去年'}}" class="more-item" style="width: 200rpx" bindtap="changePast">去年</view>
+                                            </view>
                                         </view>
                                     </view>
                                 </van-dropdown-item>

pages/varComm/pages/event/index.wxml

@@ -2,7 +2,7 @@
 <van-dialog id="van-dialog" />
 <view class="box">
     <view class="add">
-        <view wx:for="{{boxArr}}" wx:key="{{item.events_id}}">
+        <view wx:for="{{boxArr}}" wx:key="events_id">
             <view class="add_box" bindtap="add" wx:if="{{item == undefined }}" data-index="{{index}}">
                 <view class="heng"></view>
                 <view class="shu"></view>

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)

pages/varComm/pages/theme/index.wxml

@@ -3,7 +3,7 @@
 <view class="box">
   <!-- <scroll-view scroll-x="true"  style=" white-space: nowrap; display: flex"> -->
   <view class="add">
-    <view wx:for="{{boxArr}}" wx:key="{{item.events_id}}" style="margin-left: 32rpx;width: 280rpx;">
+    <view wx:for="{{boxArr}}" wx:key="events_id" style="margin-left: 32rpx;width: 280rpx;">
       <view class="add_box" bindtap="add" wx:if="{{item == undefined }}" data-index="{{index}}">
         <view class="heng"></view>
         <view class="shu"></view>