From 40441f604d9f705ae917d50367c2099ba8a618cc Mon Sep 17 00:00:00 2001 From: "tian.guangyuan" Date: Mon, 1 Jun 2020 12:00:17 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E3=80=90fix=E3=80=91=20=E5=A4=84=E7=90=86?= =?UTF-8?q?=20nbs=20=E7=9B=B8=E5=90=8C=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/nbs/List.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/ebiz/nbs/List.vue b/src/views/ebiz/nbs/List.vue index 890289780..e202d1907 100644 --- a/src/views/ebiz/nbs/List.vue +++ b/src/views/ebiz/nbs/List.vue @@ -85,11 +85,11 @@ export default { } }) } - if (data.trigger == 'left_button_click') { - this.$jump({ - flag: 'home' - }) - } + // if (data.trigger == 'left_button_click') { + // this.$jump({ + // flag: 'home' + // }) + // } }, getList() { this.$toast.loading({ From e089f9aad81a1673a622f446aa357136e5d38a49 Mon Sep 17 00:00:00 2001 From: "tian.guangyuan" Date: Mon, 1 Jun 2020 16:18:42 +0800 Subject: [PATCH 2/5] =?UTF-8?q?Revert=20"=E3=80=90fix=E3=80=91=20=E5=A4=84?= =?UTF-8?q?=E7=90=86=20nbs=20=E7=9B=B8=E5=90=8C=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 40441f604d9f705ae917d50367c2099ba8a618cc. --- src/views/ebiz/nbs/List.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/ebiz/nbs/List.vue b/src/views/ebiz/nbs/List.vue index e202d1907..890289780 100644 --- a/src/views/ebiz/nbs/List.vue +++ b/src/views/ebiz/nbs/List.vue @@ -85,11 +85,11 @@ export default { } }) } - // if (data.trigger == 'left_button_click') { - // this.$jump({ - // flag: 'home' - // }) - // } + if (data.trigger == 'left_button_click') { + this.$jump({ + flag: 'home' + }) + } }, getList() { this.$toast.loading({ From 816c813fc6d26c324dec3adf93e10bd0d874ef18 Mon Sep 17 00:00:00 2001 From: "tian.guangyuan" Date: Mon, 1 Jun 2020 16:24:41 +0800 Subject: [PATCH 3/5] =?UTF-8?q?[fix]=20=E5=B0=86=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E5=88=B0=E9=A6=96=E9=A1=B5=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=85=B3?= =?UTF-8?q?=E9=97=AD=20webview=5Fclosed?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/nbs/List.vue | 9 ++++++--- src/views/ebiz/proposal/List.vue | 10 ++++++---- src/views/ebiz/sale/List.vue | 8 +++++--- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/src/views/ebiz/nbs/List.vue b/src/views/ebiz/nbs/List.vue index 890289780..2110910fb 100644 --- a/src/views/ebiz/nbs/List.vue +++ b/src/views/ebiz/nbs/List.vue @@ -86,9 +86,12 @@ export default { }) } if (data.trigger == 'left_button_click') { - this.$jump({ - flag: 'home' - }) + // eslint-disable-next-line no-undef + EWebBridge.webCallAppInJs('webview_closed',{}) + // return + // this.$jump({ + // flag: 'home' + // }) } }, getList() { diff --git a/src/views/ebiz/proposal/List.vue b/src/views/ebiz/proposal/List.vue index e06fab055..6bf9b82c5 100644 --- a/src/views/ebiz/proposal/List.vue +++ b/src/views/ebiz/proposal/List.vue @@ -125,10 +125,12 @@ export default { methods: { appCallBack(data) { if (data.trigger == 'left_button_click') { - this.$jump({ - flag: 'home', - extra: {} - }) + // eslint-disable-next-line no-undef + EWebBridge.webCallAppInJs('webview_closed',{}) + // this.$jump({ + // flag: 'home', + // extra: {} + // }) } }, //获取建议书列表 diff --git a/src/views/ebiz/sale/List.vue b/src/views/ebiz/sale/List.vue index 4f01402d4..9a0887312 100644 --- a/src/views/ebiz/sale/List.vue +++ b/src/views/ebiz/sale/List.vue @@ -203,9 +203,11 @@ export default { methods: { appCallBack(data) { if (data.trigger == 'left_button_click') { - this.$jump({ - flag: 'home' - }) + // eslint-disable-next-line no-undef + EWebBridge.webCallAppInJs('webview_closed',{}) + // this.$jump({ + // flag: 'home' + // }) } }, //分页用 From e920f5556781c5602f87583e51df8ffeacdcce43 Mon Sep 17 00:00:00 2001 From: "tian.guangyuan" Date: Mon, 1 Jun 2020 16:56:08 +0800 Subject: [PATCH 4/5] =?UTF-8?q?[fix]=20=E5=AF=B9=20ios=20=E7=89=B9?= =?UTF-8?q?=E5=88=AB=E5=A4=84=E7=90=86=EF=BC=8C=20=E7=94=B5=E5=AD=90?= =?UTF-8?q?=E4=BF=9D=E5=8D=95=E5=88=97=E8=A1=A8=E3=80=81=E5=BB=BA=E8=AE=AE?= =?UTF-8?q?=E4=B9=A6=E5=88=97=E8=A1=A8=E3=80=81nbs=E5=88=97=E8=A1=A8=20?= =?UTF-8?q?=E7=9A=84=E8=BF=94=E5=9B=9E=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/nbs/List.vue | 15 +++++++++------ src/views/ebiz/proposal/List.vue | 15 +++++++++------ src/views/ebiz/sale/List.vue | 15 ++++++++++----- 3 files changed, 28 insertions(+), 17 deletions(-) diff --git a/src/views/ebiz/nbs/List.vue b/src/views/ebiz/nbs/List.vue index 2110910fb..c6ef9cb76 100644 --- a/src/views/ebiz/nbs/List.vue +++ b/src/views/ebiz/nbs/List.vue @@ -86,12 +86,15 @@ export default { }) } if (data.trigger == 'left_button_click') { - // eslint-disable-next-line no-undef - EWebBridge.webCallAppInJs('webview_closed',{}) - // return - // this.$jump({ - // flag: 'home' - // }) + if(JSON.parse(localStorage.device).source == "ios"){ + this.$jump({ + flag: 'service' + }) + return + } + this.$jump({ + flag: 'home' + }) } }, getList() { diff --git a/src/views/ebiz/proposal/List.vue b/src/views/ebiz/proposal/List.vue index 6bf9b82c5..32da967ac 100644 --- a/src/views/ebiz/proposal/List.vue +++ b/src/views/ebiz/proposal/List.vue @@ -125,12 +125,15 @@ export default { methods: { appCallBack(data) { if (data.trigger == 'left_button_click') { - // eslint-disable-next-line no-undef - EWebBridge.webCallAppInJs('webview_closed',{}) - // this.$jump({ - // flag: 'home', - // extra: {} - // }) + if(JSON.parse(localStorage.device).source == "ios"){ + this.$jump({ + flag: 'service' + }) + return + } + this.$jump({ + flag: 'home' + }) } }, //获取建议书列表 diff --git a/src/views/ebiz/sale/List.vue b/src/views/ebiz/sale/List.vue index 9a0887312..cf3a371e1 100644 --- a/src/views/ebiz/sale/List.vue +++ b/src/views/ebiz/sale/List.vue @@ -203,11 +203,16 @@ export default { methods: { appCallBack(data) { if (data.trigger == 'left_button_click') { - // eslint-disable-next-line no-undef - EWebBridge.webCallAppInJs('webview_closed',{}) - // this.$jump({ - // flag: 'home' - // }) + if(JSON.parse(localStorage.device).source == "ios"){ + this.$jump({ + flag: 'service' + }) + return + } + return + this.$jump({ + flag: 'home' + }) } }, //分页用 From 230cfdf3e2b3a579359cbec988caf819c8bafc10 Mon Sep 17 00:00:00 2001 From: "tian.guangyuan" Date: Tue, 2 Jun 2020 09:54:24 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E3=80=90fix=E3=80=91=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=20=E9=94=99=E8=AF=AF=E7=9A=84return?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/sale/List.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/ebiz/sale/List.vue b/src/views/ebiz/sale/List.vue index cf3a371e1..a5e0f354f 100644 --- a/src/views/ebiz/sale/List.vue +++ b/src/views/ebiz/sale/List.vue @@ -209,7 +209,6 @@ export default { }) return } - return this.$jump({ flag: 'home' })