diff --git a/app.js b/app.js index 3a28896..1b6f647 100644 --- a/app.js +++ b/app.js @@ -2,7 +2,7 @@ const tdsdk = require('./libs/tdweapp.js') App({ //----------------------------------------------globalData-------------------------------------- - evn: 0,//0:开发环境,1:测试环境,2:生产环境 + evn: 1,//0:开发环境,1:测试环境,2:生产环境 tmplIds: ['SUjEgwDopCv9xkkSZ4KbS0L7XbAiVQor6GmPg14K760'], agentMsgIds: ['kG8DErWDpyzBHCFaLlSKYMF7xVy8UpgogCwV_WSNt10', 'lOQ8Gvyy_dTk68bYGpRVnVA0M7DsYYrV81Gd39GUPBA'], version: 152, diff --git a/assets/image/icon-printer.png b/assets/image/icon-printer.png new file mode 100644 index 0000000..27b0251 Binary files /dev/null and b/assets/image/icon-printer.png differ diff --git a/pages/home/index/index.wxml b/pages/home/index/index.wxml index b5ff458..aa3f6be 100644 --- a/pages/home/index/index.wxml +++ b/pages/home/index/index.wxml @@ -150,10 +150,10 @@ 我的客服 - + 收货地址 diff --git a/pages/moment/fragment/index.js b/pages/moment/fragment/index.js index dcaa79a..730c7a8 100644 --- a/pages/moment/fragment/index.js +++ b/pages/moment/fragment/index.js @@ -80,7 +80,11 @@ Component({ wx.navigateTo({url: `/pages/home/city-select/index?type=1` }) }, feedback: function(){ - util.navigateTo('/pages/article/feedback/index') + if(this.data.tabIndex == 3){ + util.navigateTo('/pages/article/list/index') + } else { + util.navigateTo('/pages/article/feedback/index') + } }, searchList: function(){ var tab = this.data.tabIndex == 3 ? 3 : 1 diff --git a/pages/moment/fragment/index.wxml b/pages/moment/fragment/index.wxml index 5f69c0f..1b17d55 100644 --- a/pages/moment/fragment/index.wxml +++ b/pages/moment/fragment/index.wxml @@ -48,6 +48,6 @@ - + \ No newline at end of file