Merge branch 'master' into dev_fix

app.js

@@ -38,7 +38,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest154? true : false;
+            data.isTest = data.isTest155? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {

pages/order/road/index.js

@@ -69,7 +69,7 @@ Page({
     })
   },
   initDate(){
-    let today = new Date(),month1 = today.getMonth()+1,month2 = (month1 + 1) % 12,year = today.getFullYear(),year2 = month1<month2?year:(year+1);
+    let today = new Date(),month1 = today.getMonth()+1,month2 = (month1 + 1)>12? (month1 + 1)% 12:(month1+1),year = today.getFullYear(),year2 = month1<month2?year:(year+1);
     let monthDays1 = this.getMonthDays(month1,year);
     let monthDays2 = this.getMonthDays(month2,year2);
     this.setData({