diff --git a/client_mp/.gitignore b/client_mp/.gitignore index bcae4da..92fa10e 100644 --- a/client_mp/.gitignore +++ b/client_mp/.gitignore @@ -1,3 +1,4 @@ node_modules/* deploy.sh -package-lock.json \ No newline at end of file +package-lock.json +unpackage/* \ No newline at end of file diff --git a/client_mp/App.vue b/client_mp/App.vue index 1139c91..ac8bcb0 100644 --- a/client_mp/App.vue +++ b/client_mp/App.vue @@ -15,6 +15,10 @@ */ this.$u.api.getUserInfo().then(res=>{ this.$u.vuex('vuex_user', res.data) + }).catch(e=>{ + uni.reLaunch({ + url:'/pages/login/login' + }) }) }, } diff --git a/client_mp/common/http.interceptor.js b/client_mp/common/http.interceptor.js index 0ef21f9..f9ef57a 100644 --- a/client_mp/common/http.interceptor.js +++ b/client_mp/common/http.interceptor.js @@ -47,10 +47,9 @@ const install = (Vue, vm) => { } else if(res.code === 401){ vm.$u.toast('验证失败,请重新登录'); - setTimeout(() => { - // 此为uView的方法,详见路由相关文档 - vm.$u.route('/pages/login/login') - }, 1500) + // uni.reLaunch({ + // url:'/pages/login/login' + // }) return false; } else{ diff --git a/client_mp/manifest.json b/client_mp/manifest.json index 73aba0b..5ca3c99 100644 --- a/client_mp/manifest.json +++ b/client_mp/manifest.json @@ -30,7 +30,6 @@ "", "", "", - "", "", "", "", @@ -45,7 +44,6 @@ "", "", "", - "", "", "", "", @@ -60,7 +58,8 @@ "", "", "" - ] + ], + "autoSdkPermissions" : true }, /* ios打包配置 */ "ios" : { @@ -70,7 +69,8 @@ "sdkConfigs" : { "speech" : { "ifly" : {} - } + }, + "ad" : {} }, "orientation" : [ "portrait-primary" ] } @@ -82,7 +82,7 @@ "appid" : "wx126bdbf0c683c357", "setting" : { "urlCheck" : false, - "minified" : false + "minified" : true }, "usingComponents" : true }, diff --git a/client_mp/pages/home/home.vue b/client_mp/pages/home/home.vue index 50397f0..b03ef4c 100644 --- a/client_mp/pages/home/home.vue +++ b/client_mp/pages/home/home.vue @@ -18,7 +18,7 @@ @body-click="taskClick" :index="item.id" padding="10"> - {{item.state}} + {{item.state}} {{item.name}} @@ -105,7 +105,11 @@ state: '执行中' }).then(res => { this.myinspecttaskList = res.data - }).catch(e => {}) + }).catch(e => { + uni.reLaunch({ + url:'/pages/login/login' + }) + }) }, openPage(path) { this.$u.route({ diff --git a/client_mp/pages/inspectrecord/index.vue b/client_mp/pages/inspectrecord/index.vue index d48e041..1fac6bd 100644 --- a/client_mp/pages/inspectrecord/index.vue +++ b/client_mp/pages/inspectrecord/index.vue @@ -1,10 +1,10 @@ diff --git a/client_mp/pages/subtask/my.vue b/client_mp/pages/subtask/my.vue index 1369c68..8fd6e66 100644 --- a/client_mp/pages/subtask/my.vue +++ b/client_mp/pages/subtask/my.vue @@ -5,7 +5,7 @@ @body-click="taskClick" :index="item.id"> - {{item.state}} + {{item.state}} {{item.name}} diff --git a/client_mp/pages/subtask/subtaskdetail.vue b/client_mp/pages/subtask/subtaskdetail.vue index 25dafc4..96dab48 100644 --- a/client_mp/pages/subtask/subtaskdetail.vue +++ b/client_mp/pages/subtask/subtaskdetail.vue @@ -1,10 +1,10 @@