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

src/views/caseManagement/components/caseentryDialog.vue

@@ -851,9 +851,9 @@ export default {
       return window.location.origin + "/API/evidence/upload";
     },
     handlePreview(file) {
-      if (file.certificatePath) {
+      if (file && file.response.data.annexName) {
         window.open(
-          window.location.origin + "/API" + file.certificatePath,
+          window.location.origin + "/API" + file.response.data.annexName,
           "_blank"
         );
       } else {

src/views/caseManagement/components/payDialog.vue

@@ -71,9 +71,10 @@ export default {
     selectCaseApplicationConfirmFn(parms) {
       selectCaseApplicationConfirm(parms).then(res => {
         console.log(res, this.form, "KKKKKKKKKKKKKKKKKKKK");
-        if(res.data.paymentStatus == 1){
+        if(res && res.data && res.data.paymentStatus == 1){
           clearInterval(this.timer);
-          this.openPay = false;
+          // this.openPay = false;
+          this.payCancel()
           this.$message({
           message: "缴费成功",
           type: "success",

src/views/paymentManagement/components/paymentdetailsDialog.vue

@@ -64,7 +64,7 @@ export default {
     };
   },
   watch: {
-    openDialog: {
+    detailform: {
       handler(val) {
         if (val) {
           setTimeout(() => {