Merge branch 'feature/fix_pay_router' into 'master'

fix: 修改定时刷新问题、修改续费跳转路由

See merge request !133

src/views/Goods/Detail/modules/detailPay.mixin.js

@@ -100,7 +100,11 @@ export default {
           // expectResult为true时期望支付结果成功，否则继续执行
           if (expectResult && !payRes?.result) return;
           // 清除定时器
-          if (this.timer) clearInterval(this.timer);
+          if (this.timer) window.clearInterval(this.timer);
+          // payOrderNo为月计划订单时跳转保单列表
+          if (+payType === 2) {
+            this.$router.replace(`/policy`);
+          }
           // 根据状态跳转页面
           const status = await this.getPolicyStatus(orderNo);
           if (["6.2-3", "6.1-3"].includes(status)) {

src/views/Policy/Detail/index.vue

@@ -36,7 +36,7 @@ export default {
   },
   async created() {
     await this.getPolicy();
-    if (this.$route?.query?.isWxH5) {
+    if (this.$route?.query?.isWxH5 && +this.policy?.payState !== 3) {
       this.$dialog({
         message: "请确认是否已经完成了微信免密支付签约",
         onCancel: this.refresh,
@@ -55,11 +55,12 @@ export default {
         payType: this.policy?.payInfo?.payOrderType,
         orderNo: this.policy?.orderNo
       };
-      this.timer = setInterval(() => this.getPayResult(true), 3000);
+      this.timer = window.setInterval(() => this.getPayResult(true), 3000);
+      this.$once("hook:beforeDestroy", () => {
+        window.clearInterval(this.timer);
+        this.timer = null;
+      });
     }
-  },
-  beforeDestroy() {
-    clearInterval(this.timer);
   }
 };
 </script>