From 4f3de1f0933602607581eeaa0eb4ea7f03e558fe Mon Sep 17 00:00:00 2001 From: "na.guo" Date: Fri, 7 Aug 2020 13:50:29 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=85=B3=E9=97=AD=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/utils/{refresh.js => getApp.js} | 16 +++++++++++ .../InstitutionalManpower/index.vue | 27 ++++++++++--------- 2 files changed, 31 insertions(+), 12 deletions(-) rename src/assets/js/utils/{refresh.js => getApp.js} (58%) diff --git a/src/assets/js/utils/refresh.js b/src/assets/js/utils/getApp.js similarity index 58% rename from src/assets/js/utils/refresh.js rename to src/assets/js/utils/getApp.js index 1665ab650..e6fb1d51c 100644 --- a/src/assets/js/utils/refresh.js +++ b/src/assets/js/utils/getApp.js @@ -15,5 +15,21 @@ export default { ] }) } + }, + closeBtn(that) { + that.$jump({ + flag: 'webview_right_button', + extra: { + btns: [ + { + img: that.$assetsUrl + 'images/del-close.png', + route: { + flag: '', + extra: {} + } + } + ] + } + }) } } diff --git a/src/views/ebiz/institutionalPerform/InstitutionalManpower/index.vue b/src/views/ebiz/institutionalPerform/InstitutionalManpower/index.vue index 11d688b78..6d1c27fa7 100644 --- a/src/views/ebiz/institutionalPerform/InstitutionalManpower/index.vue +++ b/src/views/ebiz/institutionalPerform/InstitutionalManpower/index.vue @@ -56,7 +56,7 @@ import Selectors from '@/views/ebiz/institutionalPerform/InstitutionalManpower/components/Selectors' import util from '@/views/ebiz/institutionalPerform/InstitutionalManpower/components/js/util' import { branchOfficeApi } from '@/api/ebiz/branchOffice/branchOffice' -import refresh from '@/assets/js/utils/refresh' +import getApp from '@/assets/js/utils/getApp' import { Tabs, Tab } from 'vant' export default { name: 'InstitutionalManpower', @@ -209,19 +209,22 @@ export default { }) .catch(err => {}) }, - refreshCallBack(data) { - console.log(data, 'data') - if (data.trigger == 'right_button_click') { - location.reload() - } + //页面返回服务页 + appCallBack(data) { + if (data.trigger == 'left_button_click') { + this.$jump({ + flag: 'service' + }) + } + } }, created() { - refresh.refreshImg() - if (process.env.NODE_ENV != 'development') { - - refresh.refreshImg() - window.appCallBack=this.refreshCallBack + var that=this + + + getApp.closeBtn(that) + window.appCallBack=this.appCallBack // setTimeout(() => { // // eslint-disable-next-line no-undef // EWebBridge.webCallAppInJs('webview_right_button', { @@ -238,7 +241,7 @@ export default { // ] // }) // }, 1000) - } + }, mounted() { // this.timeVal=this.$route.query.timeVal||"" From 60d64ad55584b3fd4845a3d9ff79bd63e148941b Mon Sep 17 00:00:00 2001 From: "na.guo" Date: Fri, 7 Aug 2020 13:53:34 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ebiz/institutionalPerform/InstitutionalManpower/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/ebiz/institutionalPerform/InstitutionalManpower/index.vue b/src/views/ebiz/institutionalPerform/InstitutionalManpower/index.vue index 6d1c27fa7..4ec913599 100644 --- a/src/views/ebiz/institutionalPerform/InstitutionalManpower/index.vue +++ b/src/views/ebiz/institutionalPerform/InstitutionalManpower/index.vue @@ -211,7 +211,7 @@ export default { }, //页面返回服务页 appCallBack(data) { - if (data.trigger == 'left_button_click') { + if (data.trigger == 'right_button_click') { this.$jump({ flag: 'service' }) @@ -302,7 +302,7 @@ export default { } table td { - text-align: center; + text-align: right; padding:8px;