Merge branch 'master' of http://git.quantgroup.cn/ui/cauchy-ui

src/views/pay/index.vue

@@ -216,9 +216,8 @@ export default {
   mounted() {
     this.orderNo = this.$route.query.orderNo || cookies.get('orderNo')?.orderNo;
     cookies.set('orderNo', { orderNo: this.orderNo });
-    if (this.$route?.query?.ocrflag || cookies.get('ocrflag')) {
+    if (this.$route?.query?.ocrflag) {
       this.payInfo = cookies.get('info') || {};
-      this.flowOrderNo = this.payInfo?.paramsData?.flowOrderNo || '';
       cookies.remove('ocrflag');
       cookies.remove('info');
       // 先支付再查询信息
@@ -456,7 +455,7 @@ export default {
         }
         error?.message && this.$toast(error?.message);
         this.error = error?.message;
-        this.retrieve();
+        this.pwdModal && this.retrieve();
         return;
       }
       const { creditPayInfo = {}, wxPayInfo = {}, flowOrderNo, aliPayInfo = {} } = data;
@@ -481,22 +480,22 @@ export default {
       ) {
         /* 密码或者短信鉴权 */
         this.close();
-        console.log(creditPayStatus, 'creditPayStatus');
         this[`${creditPayStatusType[creditPayStatus]}Modal`] = true;
         return;
       } else if (creditPayStatus === FACE_VERIFICATION_CODE_PAY) {
         /* 人脸鉴权 */
         cookies.set('info', {
-          paramsData,
+          paramsData: {
+            flowOrderNo: this.flowOrderNo,
+            ...paramsData
+          },
           payType: this.payType,
           selectedCoupon: this.selectedCoupon,
           isCheckAgreement: this.isCheckAgreement,
           mergePayPretreatmentId: this.mergePayPretreatmentId
         });
         this.close();
-        setTimeout(() => {
-          this.goOcr();
-        }, 500);
+        this.goOcr();
       }
     },
     payResult(type, error) {
@@ -571,7 +570,6 @@ export default {
         flowOrderNo: this.flowOrderNo,
         callBackUrl: encodeURIComponent(`${window.location.href}&ocrflag=1`)
       });
-      cookies.set('ocrflag', 1);
       if (!res.callBackUrl) return;
       window.location.href = res.callBackUrl;
     },