diff --git a/app.js b/app.js index b60a441..409ed81 100644 --- a/app.js +++ b/app.js @@ -1,6 +1,6 @@ //app.js App({ - evn: 0, // 0: 开发版本;1:测试版本;2:生产版本 + evn: 2, // 0: 开发版本;1:测试版本;2:生产版本 tmplIds: ['AFoM5TOfsgERsfcetNSB0UlmEixnLF1ySXr54Bqno2M', 'lOQ8Gvyy_dTk68bYGpRVnVA0M7DsYYrV81Gd39GUPBA'], version: '1.5.0', xAppId: '503258978847953926', diff --git a/components/transition/index.wxml b/components/transition/index.wxml index f030137..61aceff 100644 --- a/components/transition/index.wxml +++ b/components/transition/index.wxml @@ -1,8 +1,4 @@ - + - + \ No newline at end of file diff --git a/pages/home/user-info/index.js b/pages/home/user-info/index.js index 6fb7a92..a4c68b8 100644 --- a/pages/home/user-info/index.js +++ b/pages/home/user-info/index.js @@ -49,7 +49,7 @@ Scene({ }, authrise: function(){ if(!app.userInfo.isAuth){ - wx.navigateTo({ url: '/pages/settig/authory/index' }) + wx.navigateTo({ url: '/pages/setting/authory/index' }) } }, settingAgent: function(){ diff --git a/pages/process/index/index.js b/pages/process/index/index.js index 4dd6447..ebdc927 100644 --- a/pages/process/index/index.js +++ b/pages/process/index/index.js @@ -129,7 +129,7 @@ Component({ wx.navigateTo({ url: '/pages/storage/order-list/index' }) } }, - fetchStatisticsInfo: function(vdate){ + fetchStatisticsInfo: function(vdate, loading){ var param = {startTime: util.formatTime(new Date(vdate[0]), 'Y-M-D'), endTime: util.formatTime(new Date(vdate[1]), 'Y-M-D')} getStatisticsInfo(param).then(result => { if(Number(result.data.priceOrderNum) > 0){ @@ -178,8 +178,13 @@ Component({ } var vdateString = util.formatDate(new Date(vdate[0]), 'Y-M-D') + '至' + util.formatDate(new Date(vdate[1]), 'Y-M-D') this.setData({ tabList: this.data.tabList, tabList2: this.data.tabList2, totalInfo: result.data, vdate, vdateString }) + if(loading){ + wx.hideLoading() + } }).catch(err => { - console.log(err) + if(loading){ + wx.hideLoading() + } }) }, showSheet: function(){ @@ -208,10 +213,12 @@ Component({ }, changeFactory: function(e){ var item = this.data.factoryList[e.currentTarget.dataset.index] + wx.showLoading({ title: '正在切换', mask: true }) headerFactoryId(item.id) event.emit('EventMessage', { what: 999, desc: 'changeFactory' }) this.setData({ visible: false, factoryId: item.id }) this.trigEvent(9) + this.fetchStatisticsInfo(this.data.vdate, true) }, trigEvent: function(zIndex){ setTimeout(() => {