From dc71b71a3b4a73f3d910d0714ad77fbf0766e2e6 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 23 Apr 2021 13:53:57 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client_mp/.gitignore | 3 ++- client_mp/App.vue | 4 +++ client_mp/common/http.interceptor.js | 7 +++-- client_mp/manifest.json | 10 +++---- client_mp/pages/home/home.vue | 8 ++++-- client_mp/pages/inspectrecord/index.vue | 8 +++--- .../pages/inspectrecord/recorddetail.vue | 2 +- client_mp/pages/inspectrecord/recorddo.vue | 2 +- client_mp/pages/login/login.vue | 4 +-- client_mp/pages/subtask/my.vue | 2 +- client_mp/pages/subtask/subtaskdetail.vue | 11 ++++---- client_mp/store/index.js | 11 +++++--- client_mp/unpackage/res/icons/1024x1024.png | Bin 339755 -> 0 bytes client_mp/unpackage/res/icons/120x120.png | Bin 10853 -> 0 bytes client_mp/unpackage/res/icons/144x144.png | Bin 14534 -> 0 bytes client_mp/unpackage/res/icons/152x152.png | Bin 15900 -> 0 bytes client_mp/unpackage/res/icons/167x167.png | Bin 18325 -> 0 bytes client_mp/unpackage/res/icons/180x180.png | Bin 20587 -> 0 bytes client_mp/unpackage/res/icons/192x192.png | Bin 22907 -> 0 bytes client_mp/unpackage/res/icons/20x20.png | Bin 1454 -> 0 bytes client_mp/unpackage/res/icons/29x29.png | Bin 2047 -> 0 bytes client_mp/unpackage/res/icons/40x40.png | Bin 2938 -> 0 bytes client_mp/unpackage/res/icons/58x58.png | Bin 4399 -> 0 bytes client_mp/unpackage/res/icons/60x60.png | Bin 4559 -> 0 bytes client_mp/unpackage/res/icons/72x72.png | Bin 5678 -> 0 bytes client_mp/unpackage/res/icons/76x76.png | Bin 6132 -> 0 bytes client_mp/unpackage/res/icons/80x80.png | Bin 6386 -> 0 bytes client_mp/unpackage/res/icons/87x87.png | Bin 7137 -> 0 bytes client_mp/unpackage/res/icons/96x96.png | Bin 7899 -> 0 bytes .../www/__uniappchooselocation.js | 1 - .../__UNI__01C03DB/www/__uniappes6.js | 1 - .../www/__uniappopenlocation.js | 1 - .../__UNI__01C03DB/www/__uniapppicker.js | 1 - .../__UNI__01C03DB/www/__uniappquill.js | 8 ------ .../www/__uniappquillimageresize.js | 1 - .../__UNI__01C03DB/www/__uniappscan.js | 1 - .../__UNI__01C03DB/www/__uniappsuccess.png | Bin 2021 -> 0 bytes .../__UNI__01C03DB/www/__uniappview.html | 25 ------------------ .../__UNI__01C03DB/www/app-config-service.js | 8 ------ .../__UNI__01C03DB/www/app-config.js | 1 - .../__UNI__01C03DB/www/app-service.js | 21 --------------- .../resources/__UNI__01C03DB/www/app-view.js | 1 - .../__UNI__01C03DB/www/manifest.json | 1 - .../www/pages/componentsA/app-sub-service.js | 1 - .../www/pages/componentsB/app-sub-service.js | 1 - .../www/pages/componentsC/app-sub-service.js | 1 - .../www/pages/library/app-sub-service.js | 1 - .../www/pages/template/app-sub-service.js | 1 - .../resources/__UNI__01C03DB/www/view.css | 1 - .../__UNI__01C03DB/www/view.umd.min.js | 6 ----- 50 files changed, 43 insertions(+), 112 deletions(-) delete mode 100644 client_mp/unpackage/res/icons/1024x1024.png delete mode 100644 client_mp/unpackage/res/icons/120x120.png delete mode 100644 client_mp/unpackage/res/icons/144x144.png delete mode 100644 client_mp/unpackage/res/icons/152x152.png delete mode 100644 client_mp/unpackage/res/icons/167x167.png delete mode 100644 client_mp/unpackage/res/icons/180x180.png delete mode 100644 client_mp/unpackage/res/icons/192x192.png delete mode 100644 client_mp/unpackage/res/icons/20x20.png delete mode 100644 client_mp/unpackage/res/icons/29x29.png delete mode 100644 client_mp/unpackage/res/icons/40x40.png delete mode 100644 client_mp/unpackage/res/icons/58x58.png delete mode 100644 client_mp/unpackage/res/icons/60x60.png delete mode 100644 client_mp/unpackage/res/icons/72x72.png delete mode 100644 client_mp/unpackage/res/icons/76x76.png delete mode 100644 client_mp/unpackage/res/icons/80x80.png delete mode 100644 client_mp/unpackage/res/icons/87x87.png delete mode 100644 client_mp/unpackage/res/icons/96x96.png delete mode 100644 client_mp/unpackage/resources/__UNI__01C03DB/www/__uniappchooselocation.js delete mode 100644 client_mp/unpackage/resources/__UNI__01C03DB/www/__uniappes6.js delete mode 100644 client_mp/unpackage/resources/__UNI__01C03DB/www/__uniappopenlocation.js delete mode 100644 client_mp/unpackage/resources/__UNI__01C03DB/www/__uniapppicker.js delete mode 100644 client_mp/unpackage/resources/__UNI__01C03DB/www/__uniappquill.js delete mode 100644 client_mp/unpackage/resources/__UNI__01C03DB/www/__uniappquillimageresize.js delete mode 100644 client_mp/unpackage/resources/__UNI__01C03DB/www/__uniappscan.js delete mode 100644 client_mp/unpackage/resources/__UNI__01C03DB/www/__uniappsuccess.png delete mode 100644 client_mp/unpackage/resources/__UNI__01C03DB/www/__uniappview.html delete mode 100644 client_mp/unpackage/resources/__UNI__01C03DB/www/app-config-service.js delete mode 100644 client_mp/unpackage/resources/__UNI__01C03DB/www/app-config.js delete mode 100644 client_mp/unpackage/resources/__UNI__01C03DB/www/app-service.js delete mode 100644 client_mp/unpackage/resources/__UNI__01C03DB/www/app-view.js delete mode 100644 client_mp/unpackage/resources/__UNI__01C03DB/www/manifest.json delete mode 100644 client_mp/unpackage/resources/__UNI__01C03DB/www/pages/componentsA/app-sub-service.js delete mode 100644 client_mp/unpackage/resources/__UNI__01C03DB/www/pages/componentsB/app-sub-service.js delete mode 100644 client_mp/unpackage/resources/__UNI__01C03DB/www/pages/componentsC/app-sub-service.js delete mode 100644 client_mp/unpackage/resources/__UNI__01C03DB/www/pages/library/app-sub-service.js delete mode 100644 client_mp/unpackage/resources/__UNI__01C03DB/www/pages/template/app-sub-service.js delete mode 100644 client_mp/unpackage/resources/__UNI__01C03DB/www/view.css delete mode 100644 client_mp/unpackage/resources/__UNI__01C03DB/www/view.umd.min.js 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 @@