Merge branch 'hcb' of SH-Arbitrate/Arbitrate-Frontend into dev

src/views/caseManagement/caseList.vue

@@ -347,6 +347,7 @@
       :payTitle="payTitle"
       :form="form"
       :payForm="payForm"
+      @getcaseApply="getcaseApply"
       @paycancelRow="paycancelRow"
     ></payDialog>
   </div>

src/views/caseManagement/components/payDialog.vue

@@ -1,14 +1,7 @@
 <template>
   <div>
-    <el-dialog
+    <el-dialog :title="payTitle" :visible.sync="openPay" v-if="openPay" width="800px" append-to-body
-      :title="payTitle"
+      :destroy-on-close="true" center>
-      :visible.sync="openPay"
-      v-if="openPay"
-      width="800px"
-      append-to-body
-      :destroy-on-close="true"
-      center
-    >
       <el-descriptions title="订单信息">
         <el-descriptions-item label="案件编号">{{
           form.caseNum
@@ -49,7 +42,7 @@
 </template>
 
 <script>
-import { casePay } from "@/api/pay/pay";
+import { casePay, selectCaseApplicationConfirm } from "@/api/pay/pay";
 import QRCode from "qrcodejs2";
 export default {
   props: ["openPay", "payTitle", "form", "payForm"],
@@ -58,6 +51,7 @@ export default {
       // key: value
       // 支付文字
       payMain: "",
+      timer:null
     };
   },
   methods: {
@@ -73,6 +67,21 @@ export default {
         colorLight: "#fff",
       });
     },
+    // 查询缴费状态
+    selectCaseApplicationConfirmFn(parms) {
+      selectCaseApplicationConfirm(parms).then(res => {
+        console.log(res, this.form, "KKKKKKKKKKKKKKKKKKKK");
+        if(res.data.paymentStatus == 1){
+          clearInterval(this.timer);
+          this.openPay = false;
+          this.$message({
+          message: "缴费成功",
+          type: "success",
+        });
+        this.$emit("getcaseApply",this.queryParams);
+        }
+      })
+    },
     // 支付
     pay(val) {
       if (this.payForm.feePayable == 0 || !this.payForm.feePayable) {
@@ -98,6 +107,12 @@ export default {
       }).then((res) => {
         this.paySrc = res.data.code_url;
         this.qrcode(this.paySrc);
+        this.timer = setInterval(() => {
+          this.selectCaseApplicationConfirmFn({ id: this.form.id })
+        }, 3000);
+        setTimeout(() => {
+          clearInterval(this.timer);
+        }, 1000*60);
       });
     },
     payCancel() {
@@ -136,17 +151,20 @@ export default {
   width: 100%;
   text-align: center;
 }
+
 ::v-deep .el-dialog {
   width: 800px;
   background: #ffffff;
   border-radius: 20px;
 }
+
 .endbutton {
   width: 154px;
   height: 37px;
   background: #ffffff;
   border: 1px solid #d0d0d0;
   border-radius: 19px;
+
   span {
     width: 31px;
     height: 13px;