From 14ea69d2b3599e921fca54bb251a7b8ddcbc3d07 Mon Sep 17 00:00:00 2001
From: yuweiqi <yu.weiqi@ebiz-fooge.com>
Date: Fri, 20 Mar 2020 17:35:37 +0800
Subject: [PATCH 1/6] =?UTF-8?q?[FIX]=E7=94=B5=E6=8A=95=E4=BC=98=E5=8C=96-?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=88=B0=E8=BE=BE=E7=AD=BE=E5=90=8D=E9=A1=B5?=
 =?UTF-8?q?=E5=90=8E=E4=B8=8D=E5=85=81=E8=AE=B8=E8=B7=B3=E5=88=B0=E5=89=8D?=
 =?UTF-8?q?=E9=9D=A2=E7=9A=84=E9=A1=B5=E9=9D=A2-IndexBar.vue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ebiz/sale/IndexBar.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/ebiz/sale/IndexBar.vue b/src/components/ebiz/sale/IndexBar.vue
index 1da75ff63..7fcc33789 100644
--- a/src/components/ebiz/sale/IndexBar.vue
+++ b/src/components/ebiz/sale/IndexBar.vue
@@ -60,7 +60,7 @@ export default {
       let url = ''
       //由 localStorage.salePageFlag 来控制是否可跳到指定页面
       console.log('点击跳转', 'pageIndex=', pageIndex, 'salePageFlag==', this.salePageFlag)
-      if (this.salePageFlag < pageIndex) return
+      if (Number(this.salePageFlag) < Number(pageIndex)) return
       switch (pageIndex) {
         case 1: //跳到投保人页面
           url = `/sale/insuredInfo?edit=1&salePageFlag=${pageIndex}`

From ad4a617f60836020c804212eab955130773b754a Mon Sep 17 00:00:00 2001
From: yuweiqi <yu.weiqi@ebiz-fooge.com>
Date: Fri, 20 Mar 2020 19:09:59 +0800
Subject: [PATCH 2/6] =?UTF-8?q?[IMP]=E7=94=B5=E6=8A=95=E4=BC=98=E5=8C=96-?=
 =?UTF-8?q?=E5=88=B0=E8=BE=BE=E7=AD=BE=E5=90=8D=E9=A1=B5=E5=90=8E=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E5=AF=BC=E8=88=AA=E6=A0=8F=E5=89=8D=E9=9D=A2=E7=9A=84?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=BC=B9=E5=87=BA=E6=8F=90=E7=A4=BA=E8=AF=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ebiz/sale/IndexBar.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/ebiz/sale/IndexBar.vue b/src/components/ebiz/sale/IndexBar.vue
index 7fcc33789..78fdc58d5 100644
--- a/src/components/ebiz/sale/IndexBar.vue
+++ b/src/components/ebiz/sale/IndexBar.vue
@@ -60,6 +60,9 @@ export default {
       let url = ''
       //由 localStorage.salePageFlag 来控制是否可跳到指定页面
       console.log('点击跳转', 'pageIndex=', pageIndex, 'salePageFlag==', this.salePageFlag)
+      if (localStorage.salePageFlag == '-10' && pageIndex != 8) {
+        this.$toast('已到达签名确认流程，不可以回到前面的流程')
+      }
       if (Number(this.salePageFlag) < Number(pageIndex)) return
       switch (pageIndex) {
         case 1: //跳到投保人页面

From 8f222eb20daddc16649d11ef63004ffffe731834 Mon Sep 17 00:00:00 2001
From: yuweiqi <yu.weiqi@ebiz-fooge.com>
Date: Fri, 20 Mar 2020 19:10:59 +0800
Subject: [PATCH 3/6] =?UTF-8?q?[FIX]=E7=94=B5=E6=8A=95=E4=BC=98=E5=8C=96-?=
 =?UTF-8?q?=E5=BB=BA=E8=AE=AE=E4=B9=A6=E5=92=8C=E7=94=B5=E6=8A=95=E9=80=9A?=
 =?UTF-8?q?=E7=94=A8=E9=A1=B5=E9=9D=A2-=E4=BA=A7=E5=93=81=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E9=A1=B5-=E5=BB=BA=E8=AE=AE=E4=B9=A6=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=A1=B6=E9=83=A8=E5=AF=BC=E8=88=AA=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/common/SelectedProduct.vue | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/views/ebiz/common/SelectedProduct.vue b/src/views/ebiz/common/SelectedProduct.vue
index 9140f2a5a..80774eb3c 100644
--- a/src/views/ebiz/common/SelectedProduct.vue
+++ b/src/views/ebiz/common/SelectedProduct.vue
@@ -1,6 +1,8 @@
 <template>
   <div style="background: #f5f5f5" class="select-product-container">
-    <index-bar></index-bar>
+    <div v-if="isFrom == 'sale'">
+      <index-bar></index-bar>
+    </div>
     <div class="mt8"></div>
     <div v-for="(item, index) in chooseProducts" :key="index" class="mb20 bg-white mh15 pv15 pr15 pl10 radius5">
       <div class="flex mv10 align-items-c">
@@ -58,6 +60,7 @@ export default {
       total: 0,
       nextStepFlag: true,
       isShow: true,
+      isFrom: localStorage.isFrom,
       salePageFlag: '3'
     }
   },
@@ -69,10 +72,12 @@ export default {
     [IndexBar.name]: IndexBar
   },
   mounted() {
-    EWebBridge.webCallAppInJs('webview_left_button', {
-      img: this.$assetsUrl + 'images/del-close@3x.png',
-      intercept: '1' //是否拦截原生返回事件 1是 其他否
-    })
+    setTimeout(() => {
+      EWebBridge.webCallAppInJs('webview_left_button', {
+        img: this.$assetsUrl + 'images/del-close@3x.png',
+        intercept: '1' //是否拦截原生返回事件 1是 其他否
+      })
+    }, 100)
     window.appCallBack = this.appCallBack
     document.body.style.backgroundColor = '#fff'
     this.getProductList()

From 665b162d9bc63cc3b39dd4c13b387fc8b5285938 Mon Sep 17 00:00:00 2001
From: yuweiqi <yu.weiqi@ebiz-fooge.com>
Date: Fri, 20 Mar 2020 19:11:43 +0800
Subject: [PATCH 4/6] =?UTF-8?q?[FIX]=E7=94=B5=E6=8A=95=E4=BC=98=E5=8C=96-?=
 =?UTF-8?q?=E7=AD=BE=E5=90=8D=E7=A1=AE=E8=AE=A4=E9=A1=B5-=E6=8B=A6?=
 =?UTF-8?q?=E6=88=AA=E5=8E=9F=E7=94=9F=E8=BF=94=E5=9B=9E=E4=BA=8B=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/sale/SignatureConfirmation.vue | 37 +++++++++++++++++--
 1 file changed, 34 insertions(+), 3 deletions(-)

diff --git a/src/views/ebiz/sale/SignatureConfirmation.vue b/src/views/ebiz/sale/SignatureConfirmation.vue
index 4813c1a87..975bd4b4f 100644
--- a/src/views/ebiz/sale/SignatureConfirmation.vue
+++ b/src/views/ebiz/sale/SignatureConfirmation.vue
@@ -287,6 +287,34 @@ export default {
     }
   },
   methods: {
+    appCallBack(data) {
+      if (data.trigger == 'left_button_click') {
+        return this.$dialog
+          .confirm({
+            className: 'dialog-delete',
+            title: '提示',
+            message: '退出流程可能会丢失部分数据，是否确认退出？',
+            cancelButtonColor: '#E9332E',
+            confirmButtonColor: '#FFFFFF'
+          })
+          .then(() => {
+            this.$jump({
+              flag: 'h5',
+              extra: {
+                title: '电子投保单列表',
+                url: location.origin + `/#/sale/list`
+              },
+              routerInfo: {
+                path: `/sale/list`,
+                type: '1'
+              }
+            })
+          })
+          .catch(() => {
+            return
+          })
+      }
+    },
     // 初始化
     async init() {
       if (this.isWeixin) {
@@ -856,9 +884,12 @@ export default {
     }
   },
   created() {
-    EWebBridge.webCallAppInJs('webview_left_button', {
-      intercept: '1' //是否拦截原生返回事件 1是 其他否
-    })
+    setTimeout(() => {
+      EWebBridge.webCallAppInJs('webview_left_button', {
+        intercept: '1' //是否拦截原生返回事件 1是 其他否
+      })
+    }, 100)
+    window.appCallBack = this.appCallBack
   },
   mounted() {
     //若进入签名页，则不允许回到签名页前面的页面

From c0571f05eb730b8497a09448fbfa233b53e48d76 Mon Sep 17 00:00:00 2001
From: yuweiqi <yu.weiqi@ebiz-fooge.com>
Date: Fri, 20 Mar 2020 19:36:42 +0800
Subject: [PATCH 5/6] =?UTF-8?q?[FIX]=E7=94=B5=E6=8A=95=E4=BC=98=E5=8C=96-?=
 =?UTF-8?q?=E5=BB=BA=E8=AE=AE=E4=B9=A6=E3=80=81=E7=94=B5=E6=8A=95=E5=85=B1?=
 =?UTF-8?q?=E7=94=A8=E9=A1=B5=E9=9D=A2-=E4=BA=A7=E5=93=81=E9=A1=B5-?=
 =?UTF-8?q?=E5=8F=AA=E5=9C=A8=E7=94=B5=E6=8A=95=E6=97=B6=E6=8B=A6=E6=88=AA?=
 =?UTF-8?q?=E5=8E=9F=E7=94=9F=E8=BF=94=E5=9B=9E=E4=BA=8B=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/common/SelectedProduct.vue | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/views/ebiz/common/SelectedProduct.vue b/src/views/ebiz/common/SelectedProduct.vue
index 80774eb3c..68ff707a8 100644
--- a/src/views/ebiz/common/SelectedProduct.vue
+++ b/src/views/ebiz/common/SelectedProduct.vue
@@ -72,12 +72,14 @@ export default {
     [IndexBar.name]: IndexBar
   },
   mounted() {
-    setTimeout(() => {
-      EWebBridge.webCallAppInJs('webview_left_button', {
-        img: this.$assetsUrl + 'images/del-close@3x.png',
-        intercept: '1' //是否拦截原生返回事件 1是 其他否
-      })
-    }, 100)
+    if (localStorage.isFrom == 'sale') {
+      setTimeout(() => {
+        EWebBridge.webCallAppInJs('webview_left_button', {
+          img: this.$assetsUrl + 'images/del-close@3x.png',
+          intercept: '1' //是否拦截原生返回事件 1是 其他否
+        })
+      }, 100)
+    }
     window.appCallBack = this.appCallBack
     document.body.style.backgroundColor = '#fff'
     this.getProductList()
@@ -112,7 +114,7 @@ export default {
   },
   methods: {
     appCallBack(data) {
-      if (data.trigger == 'left_button_click') {
+      if (data.trigger == 'left_button_click' && localStorage.isFrom == 'sale') {
         return this.$dialog
           .confirm({
             className: 'dialog-delete',
@@ -126,6 +128,7 @@ export default {
               flag: 'h5',
               extra: {
                 title: '电子投保单列表',
+                forbidSwipeBack: 1, //当前页面禁止右滑返回
                 url: location.origin + `/#/sale/list`
               },
               routerInfo: {

From 8532323f2be8bd4b89c55ba280d3392ec589ce68 Mon Sep 17 00:00:00 2001
From: yuweiqi <yu.weiqi@ebiz-fooge.com>
Date: Fri, 20 Mar 2020 19:39:39 +0800
Subject: [PATCH 6/6] =?UTF-8?q?[FIX]=E7=94=B5=E6=8A=95=E4=BC=98=E5=8C=96-?=
 =?UTF-8?q?=E8=B7=B3=E5=88=B0=E5=88=97=E8=A1=A8=E9=A1=B5=E6=97=B6=E7=A6=81?=
 =?UTF-8?q?=E6=AD=A2=E5=88=97=E8=A1=A8=E9=A1=B5=E5=8F=B3=E6=BB=91=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/sale/AccountInformation.vue    | 1 +
 src/views/ebiz/sale/AttachmentManagement.vue  | 1 +
 src/views/ebiz/sale/Beneficiary.vue           | 1 +
 src/views/ebiz/sale/InsuredInfo.vue           | 1 +
 src/views/ebiz/sale/InsuredPerson.vue         | 1 +
 src/views/ebiz/sale/NotifyingMessage.vue      | 1 +
 src/views/ebiz/sale/SignatureConfirmation.vue | 1 +
 7 files changed, 7 insertions(+)

diff --git a/src/views/ebiz/sale/AccountInformation.vue b/src/views/ebiz/sale/AccountInformation.vue
index 0ea12ba9b..8fb088677 100644
--- a/src/views/ebiz/sale/AccountInformation.vue
+++ b/src/views/ebiz/sale/AccountInformation.vue
@@ -249,6 +249,7 @@ export default {
               flag: 'h5',
               extra: {
                 title: '电子投保单列表',
+                forbidSwipeBack: 1, //当前页面禁止右滑返回
                 url: location.origin + `/#/sale/list`
               },
               routerInfo: {
diff --git a/src/views/ebiz/sale/AttachmentManagement.vue b/src/views/ebiz/sale/AttachmentManagement.vue
index 4560241ab..1e14282d2 100644
--- a/src/views/ebiz/sale/AttachmentManagement.vue
+++ b/src/views/ebiz/sale/AttachmentManagement.vue
@@ -556,6 +556,7 @@ export default {
               flag: 'h5',
               extra: {
                 title: '电子投保单列表',
+                forbidSwipeBack: 1, //当前页面禁止右滑返回
                 url: location.origin + `/#/sale/list`
               },
               routerInfo: {
diff --git a/src/views/ebiz/sale/Beneficiary.vue b/src/views/ebiz/sale/Beneficiary.vue
index 575a50d7a..6c3b1f19a 100644
--- a/src/views/ebiz/sale/Beneficiary.vue
+++ b/src/views/ebiz/sale/Beneficiary.vue
@@ -135,6 +135,7 @@ export default {
               flag: 'h5',
               extra: {
                 title: '电子投保单列表',
+                forbidSwipeBack: 1, //当前页面禁止右滑返回
                 url: location.origin + `/#/sale/list`
               },
               routerInfo: {
diff --git a/src/views/ebiz/sale/InsuredInfo.vue b/src/views/ebiz/sale/InsuredInfo.vue
index 9c163f061..cb567cdb8 100644
--- a/src/views/ebiz/sale/InsuredInfo.vue
+++ b/src/views/ebiz/sale/InsuredInfo.vue
@@ -550,6 +550,7 @@ export default {
               flag: 'h5',
               extra: {
                 title: '电子投保单列表',
+                forbidSwipeBack:1,//当前页面禁止右滑返回
                 url: location.origin + `/#/sale/list`
               },
               routerInfo: {
diff --git a/src/views/ebiz/sale/InsuredPerson.vue b/src/views/ebiz/sale/InsuredPerson.vue
index f9146fd2e..c23d2c236 100644
--- a/src/views/ebiz/sale/InsuredPerson.vue
+++ b/src/views/ebiz/sale/InsuredPerson.vue
@@ -1032,6 +1032,7 @@ export default {
               flag: 'h5',
               extra: {
                 title: '电子投保单列表',
+                forbidSwipeBack: 1, //当前页面禁止右滑返回
                 url: location.origin + `/#/sale/list`
               },
               routerInfo: {
diff --git a/src/views/ebiz/sale/NotifyingMessage.vue b/src/views/ebiz/sale/NotifyingMessage.vue
index f017e40d2..11d46ad8c 100644
--- a/src/views/ebiz/sale/NotifyingMessage.vue
+++ b/src/views/ebiz/sale/NotifyingMessage.vue
@@ -265,6 +265,7 @@ export default {
               flag: 'h5',
               extra: {
                 title: '电子投保单列表',
+                forbidSwipeBack: 1, //当前页面禁止右滑返回
                 url: location.origin + `/#/sale/list`
               },
               routerInfo: {
diff --git a/src/views/ebiz/sale/SignatureConfirmation.vue b/src/views/ebiz/sale/SignatureConfirmation.vue
index 975bd4b4f..80ed8022f 100644
--- a/src/views/ebiz/sale/SignatureConfirmation.vue
+++ b/src/views/ebiz/sale/SignatureConfirmation.vue
@@ -302,6 +302,7 @@ export default {
               flag: 'h5',
               extra: {
                 title: '电子投保单列表',
+                forbidSwipeBack: 1, //当前页面禁止右滑返回
                 url: location.origin + `/#/sale/list`
               },
               routerInfo: {