Merge branch 'feature/GFRS-247【待确定】卡单产品投保' into dev

src/views/ebiz/cardList/CardTotreasure.vue

@@ -52,7 +52,7 @@
                   <span>被保人：</span><span>{{ orderItem.insuredDTOs[0].name }}</span>
                 </div>
                 <div>
-                  <span>订单状态：</span><span>{{ orderItem.orderStatus | statusFormat }}</span>
+                  <span>订单状态：</span><span>{{ orderItem.orderInfoDTO.orderStatus | statusFormat }}</span>
                 </div>
               </div>
               <template v-if="orderList.length === 0">

src/views/ebiz/cardList/PayResult.vue

@@ -73,6 +73,22 @@ export default {
     [CellGroup.name]: CellGroup
   },
   methods: {
+    appCallBack(data) {
+      if (data.trigger == 'left_button_click') {
+        this.$jump({
+          flag: 'h5',
+          extra: {
+            title: '产品列表',
+            forbidSwipeBack: 1, //当前页面禁止右滑返回
+            url: location.origin + `/#/cardList/CardTotreasure`
+          },
+          routerInfo: {
+            path: `/cardList/CardTotreasure`,
+            type: '1'
+          }
+        })
+      }
+    },
     // 返回列表页
     next() {
       this.$jump({
@@ -132,6 +148,16 @@ export default {
     //   })
     // }
   },
+  created() {
+    setTimeout(() => {
+      // eslint-disable-next-line no-undef
+      EWebBridge.webCallAppInJs('webview_left_button', {
+        img: this.$assetsUrl + 'images/del-close-btn@3x.png',
+        intercept: '1' //是否拦截原生返回事件 1是 其他否
+      })
+    }, 100)
+    window.appCallBack = this.appCallBack
+  },
   mounted() {
     let that = this
     // document.body.style.backgroundColor = '#fff'
@@ -147,7 +173,7 @@ export default {
     } else {
       this.queryPayState()
     }
-  },
+  }
   // beforeRouteLeave(to, from, next) {
   //   document.body.style.backgroundColor = ''
   //   next()

src/views/ebiz/cardList/information.vue

@@ -985,9 +985,7 @@ export default {
       params.orderDTO.insuredDTOs[0].riskDTOLst = riskDTOLst
 
       let resultData = await saveOrUpdateCard(params)
-      console.log('请求参数', params)
       if (resultData.result == 0) {
-        console.log('响应参数== ', resultData)
         console.log(' resultData.orderNo', resultData.content.object)
         //存储被保人信息
         // let age = utilsAge.getAge(this.userInfo.birthday, new Date())