From 97bcb6b022a0b46d87620630e758a1ce36444134 Mon Sep 17 00:00:00 2001
From: mengxiaolong <meng.xiaolong@ebiz-digits.com>
Date: Wed, 16 Sep 2020 18:31:55 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E6=92=A4=E5=8D=95=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/sale/List.vue | 147 ++++++++++++++++++++++++++++-------
 1 file changed, 121 insertions(+), 26 deletions(-)

diff --git a/src/views/ebiz/sale/List.vue b/src/views/ebiz/sale/List.vue
index fe6d91425..c40d43168 100644
--- a/src/views/ebiz/sale/List.vue
+++ b/src/views/ebiz/sale/List.vue
@@ -125,6 +125,16 @@
                   >去支付</van-button
                 >
 
+                <van-button
+                  @click="revokeOrder(order)"
+                  v-if="active == 'commit' && canRevoke[order.orderInfoDTO.orderStatus]"
+                  size="small"
+                  class="mr5"
+                  type="danger"
+                  round
+                  >撤单</van-button
+                >
+
                 <!-- <van-button
                   @click="goNucleus(order)"
                   v-if="active == 'commit' && order.orderInfoDTO.orderStatus == '46'"
@@ -148,14 +158,33 @@
     </van-list>
 
     <van-button type="danger" class="bottom-btn" @click="add" v-no-more-click="1000">点我新增</van-button>
+    <van-dialog
+      class="dialog-delete"
+      @confirm="checkCaptchaCode"
+      @cancel="cancelCaptchaCode"
+      :before-close="beforeClose"
+      confirm-button-color="#fff"
+      v-model="revokePanelShow"
+      title="标题"
+      show-cancel-button
+    >
+      <van-field v-model="sms" center clearable placeholder="请输入短信验证码">
+        <template #button>
+          <van-button :disabled="sendTime !== 0" v-no-more-click="1000" @click="getCaptchaCode" size="small" type="danger">{{
+            sendTime ? `${sendTime}s后获取` : '获取验证码'
+          }}</van-button>
+        </template>
+      </van-field>
+    </van-dialog>
   </div>
 </template>
 
 <script>
-import { Search, Tabs, Tab, List, Tag, Sticky, Toast, Dialog } from 'vant'
+import { Search, Tabs, Tab, List, Tag, Sticky, Toast, Dialog, Field } from 'vant'
 import { orderList, deleteOrderInfo, revokeOrder } from '@/api/ebiz/sale/sale'
 import { formatRiskList } from '@/assets/js/utils/formatRiskList.js'
 import dataDictionary from '@/assets/js/utils/data-dictionary' //根据数据字典找到用户等级
+import { getAuthCode, autchCodeCheck } from '@/api/ebiz/sale/sale'
 
 export default {
   name: 'saleList',
@@ -166,7 +195,8 @@ export default {
     [List.name]: List,
     [Tag.name]: Tag,
     [Sticky.name]: Sticky,
-    [Dialog.name]: Dialog
+    [Dialog.name]: Dialog,
+    [Field.name]: Field
   },
   data() {
     return {
@@ -188,11 +218,21 @@ export default {
         '48': true,
         '49': true,
         '55': true
-      }
+      },
+      revokePanelShow: false,
+      sms: '',
+      smsId: '',
+      sendTime: 0,
+      getCaptcha: false,
+      captchaTimer: null,
+      captchaReceiver: '',
+      revokeOrderNo: '',
+      captchaMaped: false
     }
   },
   mounted() {
     setTimeout(() => {
+      // eslint-disable-next-line no-undef
       EWebBridge.webCallAppInJs('webview_left_button', {
         intercept: '1' //是否拦截原生返回事件 1是 其他否
       })
@@ -201,6 +241,79 @@ export default {
     this.loadMore()
   },
   methods: {
+    beforeClose(action, done) {
+      this.captchaMaped ? done() : done(false)
+    },
+    async getCaptchaCode() {
+      if (this.sendTime !== 0) return
+      this.getCaptcha = true
+      this.sendTime = 60
+      let data = {
+        operateType: 'appntInfoEntry',
+        type: 'H5',
+        operateCode: this.captchaReceiver,
+        system: 'agentApp',
+        operateCodeType: '0'
+      }
+      let res = await getAuthCode(data)
+      if (res.result === '0') {
+        this.$toast('获取验证码成功')
+      }
+      this.smsId = res.sessionId
+      this.captchaTimer = setInterval(() => {
+        this.sendTime--
+        if (this.sendTime === 0) {
+          clearInterval(this.captchaTimer)
+          this.captchaTimer = null
+        }
+      }, 1000)
+    },
+    async checkCaptchaCode() {
+      if (!this.getCaptcha) {
+        return this.$toast('请先获取验证码')
+      }
+      if (!this.sms.trim()) {
+        return this.$toast('请输入验证码')
+      }
+      let res = await autchCodeCheck({
+        smsId: this.smsId,
+        code: this.sms
+      })
+      if (res.result === '0') {
+        clearInterval(this.captchaTimer)
+        this.captchaTimer = null
+        let revokeResult = await revokeOrder({
+          id: this.revokeOrderNo,
+          smsId: this.smsId,
+          code: this.sms
+        })
+        if (revokeResult.result == 0) {
+          this.saleList = []
+          this.isSuccess = false
+          this.currentPage = 1
+          ;[this.loading, this.finished] = [true, false]
+          let pageInfo = {
+            pageNum: this.currentPage,
+            pageSize: this.pageSize,
+            orderType: this.active
+          }
+          this.loadMore(pageInfo)
+        } else {
+          Toast.fail(res.resultMessage)
+        }
+      } else {
+        this.$toast(res.resultMessage)
+      }
+      this.sms = ''
+    },
+    cancelCaptchaCode() {
+      this.sendTime = 0
+      this.revokePanelShow = false
+      clearInterval(this.captchaTimer)
+      this.captchaTimer = null
+      this.getCaptcha = false
+      this.captchaMaped = false
+    },
     appCallBack(data) {
       if (data.trigger == 'left_button_click') {
         this.$jump({
@@ -329,7 +442,6 @@ export default {
       // })
 
       orderList(pageInfo).then(res => {
-        console.log('调用了一次')
         // this.$toast.clear()
         if (res.result == '0') {
           this.isSuccess = true
@@ -355,7 +467,6 @@ export default {
             })
           })
           this.saleList = this.saleList.concat(list)
-          console.log(this.saleList.length)
           if (this.saleList.length == 0) {
             this.isSuccess = false
           }
@@ -401,7 +512,6 @@ export default {
       localStorage.orderNo = orderNo
       localStorage.isFrom = 'sale'
       localStorage.removeItem('changeCard')
-      console.log('---orderStatus：', orderStatus, orderNo)
       switch (orderStatus) {
         case '01': //已签名待客户确认, 跳到签名确认页面
           url = '/sale/SignatureConfirmation?edit=1'
@@ -446,7 +556,7 @@ export default {
       })
     },
     //删除投保单
-    del(order, index) {
+    del(order) {
       let params = {
         orderType: 'DEL_ORDER', //列表页 此值为固定
         id: order.orderInfoDTO.orderNo,
@@ -467,7 +577,6 @@ export default {
         .then(() => {
           deleteOrderInfo(params).then(res => {
             if (res.result == 0) {
-              console.log(index)
               this.saleList = []
               this.isSuccess = false
               this.currentPage = 1
@@ -505,6 +614,7 @@ export default {
       })
     },
     revokeOrder(order) {
+      console.dir(order)
       this.$dialog
         .confirm({
           className: 'dialog-delete',
@@ -514,25 +624,10 @@ export default {
           confirmButtonColor: '#FFFFFF'
         })
         .then(() => {
-          return revokeOrder({ id: order.orderInfoDTO.orderNo })
+          this.revokePanelShow = true
+          this.captchaReceiver = order.appntDTO.mobile
+          this.revokeOrderNo = order.orderInfoDTO.orderNo
         })
-        .then(res => {
-          if (res.result == 0) {
-            this.saleList = []
-            this.isSuccess = false
-            this.currentPage = 1
-            ;[this.loading, this.finished] = [true, false]
-            let pageInfo = {
-              pageNum: this.currentPage,
-              pageSize: this.pageSize,
-              orderType: this.active
-            }
-            this.loadMore(pageInfo)
-          } else {
-            Toast.fail(res.resultMessage)
-          }
-        })
-        .catch(() => {})
     }
   }
 }

From 2c41a87cccf5bdf69efe5b45ca9d115b362dbb90 Mon Sep 17 00:00:00 2001
From: mengxiaolong <meng.xiaolong@ebiz-digits.com>
Date: Thu, 17 Sep 2020 09:04:59 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E6=92=A4=E5=8D=95=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=AA=8C=E8=AF=81=E7=A0=81=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/sale/List.vue | 38 ++++++++++++++----------------------
 1 file changed, 15 insertions(+), 23 deletions(-)

diff --git a/src/views/ebiz/sale/List.vue b/src/views/ebiz/sale/List.vue
index c40d43168..ee462908a 100644
--- a/src/views/ebiz/sale/List.vue
+++ b/src/views/ebiz/sale/List.vue
@@ -275,34 +275,26 @@ export default {
       if (!this.sms.trim()) {
         return this.$toast('请输入验证码')
       }
-      let res = await autchCodeCheck({
+      clearInterval(this.captchaTimer)
+      this.captchaTimer = null
+      let revokeResult = await revokeOrder({
+        id: this.revokeOrderNo,
         smsId: this.smsId,
         code: this.sms
       })
-      if (res.result === '0') {
-        clearInterval(this.captchaTimer)
-        this.captchaTimer = null
-        let revokeResult = await revokeOrder({
-          id: this.revokeOrderNo,
-          smsId: this.smsId,
-          code: this.sms
-        })
-        if (revokeResult.result == 0) {
-          this.saleList = []
-          this.isSuccess = false
-          this.currentPage = 1
-          ;[this.loading, this.finished] = [true, false]
-          let pageInfo = {
-            pageNum: this.currentPage,
-            pageSize: this.pageSize,
-            orderType: this.active
-          }
-          this.loadMore(pageInfo)
-        } else {
-          Toast.fail(res.resultMessage)
+      if (revokeResult.result == 0) {
+        this.saleList = []
+        this.isSuccess = false
+        this.currentPage = 1
+        ;[this.loading, this.finished] = [true, false]
+        let pageInfo = {
+          pageNum: this.currentPage,
+          pageSize: this.pageSize,
+          orderType: this.active
         }
+        this.loadMore(pageInfo)
       } else {
-        this.$toast(res.resultMessage)
+        Toast.fail(revokeResult.resultMessage)
       }
       this.sms = ''
     },

From 0aae973fc3d4a7552281f646c7a349e7b8abcf88 Mon Sep 17 00:00:00 2001
From: mengxiaolong <meng.xiaolong@ebiz-digits.com>
Date: Thu, 17 Sep 2020 11:30:32 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E6=92=A4=E5=8D=95=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=88=90=E5=8A=9F=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/sale/List.vue | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/views/ebiz/sale/List.vue b/src/views/ebiz/sale/List.vue
index ee462908a..b8b9840f9 100644
--- a/src/views/ebiz/sale/List.vue
+++ b/src/views/ebiz/sale/List.vue
@@ -184,7 +184,7 @@ import { Search, Tabs, Tab, List, Tag, Sticky, Toast, Dialog, Field } from 'vant
 import { orderList, deleteOrderInfo, revokeOrder } from '@/api/ebiz/sale/sale'
 import { formatRiskList } from '@/assets/js/utils/formatRiskList.js'
 import dataDictionary from '@/assets/js/utils/data-dictionary' //根据数据字典找到用户等级
-import { getAuthCode, autchCodeCheck } from '@/api/ebiz/sale/sale'
+import { getAuthCode } from '@/api/ebiz/sale/sale'
 
 export default {
   name: 'saleList',
@@ -283,19 +283,23 @@ export default {
         code: this.sms
       })
       if (revokeResult.result == 0) {
-        this.saleList = []
-        this.isSuccess = false
-        this.currentPage = 1
-        ;[this.loading, this.finished] = [true, false]
-        let pageInfo = {
-          pageNum: this.currentPage,
-          pageSize: this.pageSize,
-          orderType: this.active
-        }
-        this.loadMore(pageInfo)
+        Toast.success('操作成功')
+        setTimeout(() => {
+          this.saleList = []
+          this.isSuccess = false
+          this.currentPage = 1
+          ;[this.loading, this.finished] = [true, false]
+          let pageInfo = {
+            pageNum: this.currentPage,
+            pageSize: this.pageSize,
+            orderType: this.active
+          }
+          this.loadMore(pageInfo)
+        }, 1000)
       } else {
         Toast.fail(revokeResult.resultMessage)
       }
+      this.cancelCaptchaCode()
       this.sms = ''
     },
     cancelCaptchaCode() {
@@ -305,6 +309,7 @@ export default {
       this.captchaTimer = null
       this.getCaptcha = false
       this.captchaMaped = false
+      this.captchaReceiver = ''
     },
     appCallBack(data) {
       if (data.trigger == 'left_button_click') {

From f7db884023d30c93f111e8d5b7b57dcc9cc82057 Mon Sep 17 00:00:00 2001
From: mengxiaolong <meng.xiaolong@ebiz-digits.com>
Date: Mon, 21 Sep 2020 10:02:08 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=92=A4=E5=8D=95?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81=E5=BC=B9=E7=AA=97=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/ebiz/sale/List.vue b/src/views/ebiz/sale/List.vue
index b8b9840f9..0b66285ee 100644
--- a/src/views/ebiz/sale/List.vue
+++ b/src/views/ebiz/sale/List.vue
@@ -165,9 +165,10 @@
       :before-close="beforeClose"
       confirm-button-color="#fff"
       v-model="revokePanelShow"
-      title="标题"
+      title="短信验证"
       show-cancel-button
     >
+      <p class="captchaReceiver">投保人手机号: {{ captchaReceiver | phoneNumFilter }}</p>
       <van-field v-model="sms" center clearable placeholder="请输入短信验证码">
         <template #button>
           <van-button :disabled="sendTime !== 0" v-no-more-click="1000" @click="getCaptchaCode" size="small" type="danger">{{
@@ -283,7 +284,7 @@ export default {
         code: this.sms
       })
       if (revokeResult.result == 0) {
-        Toast.success('操作成功')
+        this.$toast('撤单成功!')
         setTimeout(() => {
           this.saleList = []
           this.isSuccess = false
@@ -616,7 +617,7 @@ export default {
         .confirm({
           className: 'dialog-delete',
           title: '提示',
-          message: '确认撤销投保单吗？',
+          message: '撤单后,数据将不可恢复,您确定要撤单吗?',
           cancelButtonColor: '#E9332E',
           confirmButtonColor: '#FFFFFF'
         })
@@ -626,10 +627,40 @@ export default {
           this.revokeOrderNo = order.orderInfoDTO.orderNo
         })
     }
+  },
+  filters: {
+    phoneNumFilter(phoneNum) {
+      let num = phoneNum.split('')
+      num.splice(3, 4, '****')
+      return num.join('')
+    }
   }
 }
 </script>
 <style lang="scss" scoped>
+/deep/ .dialog-delete .van-dialog__header {
+  padding: 0.5em;
+  margin-bottom: 0;
+  border-bottom: 1px solid #eaeaea;
+}
+
+/deep/ .van-cell {
+  padding: 0;
+  padding-bottom: 0.5em;
+  border-bottom: 1px solid #eaeaea;
+}
+
+/deep/ .van-dialog__content {
+  padding: 1em;
+}
+
+.captchaReceiver {
+  margin-bottom: 1em;
+  padding-bottom: 1em;
+  border-bottom: 1px solid #eaeaea;
+  font-size: 14px;
+}
+
 .van-search__content {
   background: #fff !important;
   border-radius: 10px;

From 5d0991b91cccd3a80afc3e7a6539456aa686e50a Mon Sep 17 00:00:00 2001
From: mengxiaolong <meng.xiaolong@ebiz-digits.com>
Date: Tue, 29 Sep 2020 10:15:45 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=AF=E6=92=A4?=
 =?UTF-8?q?=E5=8D=95=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/sale/List.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/ebiz/sale/List.vue b/src/views/ebiz/sale/List.vue
index 0b66285ee..a633f8d7f 100644
--- a/src/views/ebiz/sale/List.vue
+++ b/src/views/ebiz/sale/List.vue
@@ -213,12 +213,12 @@ export default {
       pageSize: 5, //每页数据条数
       isSuccess: false,
       canRevoke: {
-        '02': true,
-        '14': true,
         '19': true,
+        '02': true,
         '48': true,
         '49': true,
-        '55': true
+        '55': true,
+        '58': true
       },
       revokePanelShow: false,
       sms: '',