From cb6b3e7578ba296d5c401b1a03dae97b0177faf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A3=B7=E5=8F=B6?=
 <14103883+leaf-phos@user.noreply.gitee.com>
Date: Thu, 28 Nov 2024 10:55:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/mixins.js                 |  4 ++--
 src/views/ss/risk/index.vue         |  5 ++++-
 src/views/ss/riskInfo/index.vue     | 20 ++++++++++++++------
 src/views/system/recharge/index.vue |  4 +---
 4 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/utils/mixins.js b/src/utils/mixins.js
index 59a2ef3..e0792f0 100644
--- a/src/utils/mixins.js
+++ b/src/utils/mixins.js
@@ -160,13 +160,13 @@ export const $recharge = {
     },
     canRefund() {
       return (row) => {
-        return row.status === '2' && row.isFinished;
+        return row.status === '2';
       }
     },
     canClose() {
       return (row) => {
         // （支付成功或者押金支付成功） 且 订单未完成
-        return [RechargeStatus.PAY_SUCCESS, RechargeStatus.DEPOSIT_SUCCESS].includes(row.status) && !row.isFinished;
+        return [RechargeStatus.PAY_SUCCESS, RechargeStatus.DEPOSIT_SUCCESS, RechargeStatus.REFUNDED, RechargeStatus.REFUNDING].includes(row.status) && !row.isFinished;
       }
     },
     // 允许修复的数据
diff --git a/src/views/ss/risk/index.vue b/src/views/ss/risk/index.vue
index 10793ed..0378ff7 100644
--- a/src/views/ss/risk/index.vue
+++ b/src/views/ss/risk/index.vue
@@ -291,6 +291,9 @@ export default {
         ],
         submitType: [
           {type: 'array', required: true, message: "提交材料不能为空", trigger: "change"}
+        ],
+        reason: [
+          { required: true, message: "风控原因不能为空", trigger: "blur" }
         ]
       }
     };
@@ -342,7 +345,7 @@ export default {
         realNameId: null,
         unsealSelf: false,
         submitType: [],
-        videoWords: `请录制视频，并按要求念出以下内容：\n【本人：XXX，身份证：XXX，正常使用共享开关用于XXX共享使用，本人保证合法合规使用，如果不正常使用本人愿意承担所有法律责任。】`
+        videoWords: `本人：XXX，身份证：XXX，正常使用共享开关用于XXX共享使用，本人保证合法合规使用，如果不正常使用本人愿意承担所有法律责任。`
       };
       this.resetForm("form");
     },
diff --git a/src/views/ss/riskInfo/index.vue b/src/views/ss/riskInfo/index.vue
index 126a5a2..016bc3e 100644
--- a/src/views/ss/riskInfo/index.vue
+++ b/src/views/ss/riskInfo/index.vue
@@ -232,14 +232,15 @@ const defaultSort = {
 
 export default {
   name: "RiskInfo",
-  computed: {
-    RiskInfoStatus() {
-      return RiskInfoStatus
-    }
-  },
-  components: { UserLink, RiskInfoVerifyDialog, VideoPreview },
   mixins: [$showColumns],
   dicts: ['risk_info_status'],
+  components: { UserLink, RiskInfoVerifyDialog, VideoPreview },
+  props: {
+    query: {
+      type: Object,
+      default: () => ({})
+    }
+  },
   data() {
     return {
       // 字段列表
@@ -310,9 +311,16 @@ export default {
       },
       openVerify:false,
       row: {},
+      RiskInfoStatus
     };
   },
   created() {
+
+    this.queryParams = {
+      ...this.queryParams,
+      ...this.query
+    }
+
     this.getList();
   },
   methods: {
diff --git a/src/views/system/recharge/index.vue b/src/views/system/recharge/index.vue
index 2b5e02b..82ef867 100644
--- a/src/views/system/recharge/index.vue
+++ b/src/views/system/recharge/index.vue
@@ -50,11 +50,9 @@
 
 <script>
 import {
-  delBill,
   refreshPayResult,
   rechargeDevice,
-  closeBill,
-  fixBill
+  closeBill
 } from '@/api/system/recharge'
 import { $recharge, $showColumns, $view } from '@/utils/mixins'
 import RefundDialog from '@/views/system/recharge/components/RefundDialog.vue'