diff --git a/apis/index.js b/apis/index.js index bc86f66..917ef93 100644 --- a/apis/index.js +++ b/apis/index.js @@ -10,8 +10,8 @@ import router from '../router' // 基础配置 const config = { - // apiUrl : 'https://douhuo.douhuofalv.com/api/', - apiUrl : 'https://api.douhuotest.douhuofalv.com/api/', //测试环境 + apiUrl : 'https://douhuo.douhuofalv.com/api/', + // apiUrl : 'https://api.douhuotest.douhuofalv.com/api/', //测试环境 timeout : 60000 } diff --git a/manifest.json b/manifest.json index 5fe86fe..5e2a603 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name" : "抖火", "appid" : "__UNI__C305C03", "description" : "纵有疾风起,人生不言弃", - "versionName" : "1.3.7", + "versionName" : "1.3.9", "versionCode" : 103, "transformPx" : false, /* 5+App特有相关 */ diff --git a/uni_modules/oct-calendar-picker/components/oct-calendar-picker/oct-calendar-picker.vue b/uni_modules/oct-calendar-picker/components/oct-calendar-picker/oct-calendar-picker.vue index c604c13..d6e227d 100644 --- a/uni_modules/oct-calendar-picker/components/oct-calendar-picker/oct-calendar-picker.vue +++ b/uni_modules/oct-calendar-picker/components/oct-calendar-picker/oct-calendar-picker.vue @@ -248,7 +248,8 @@ let year = moment().get('year') let month = moment().get('month') + 1 let today = moment().get('date') - let start = moment([year, month, today]).month(-(num - 2)).format('YYYY-MM-DD') + + let start = moment().subtract(num, 'month').format('YYYY-MM-DD') let ymdArr = start.split('-') let { months, days } = this.getNewYM(ymdArr[0], ymdArr[1])