Merge branch 'dev'

src/views/menu.vue

@@ -256,10 +256,9 @@ export default {
           key: 'url',
           key: 'url',
           width: '',
           width: '',
           render: (item) => (
           render: (item) => (
-            <el-checkbox
+            <el-switch
               value={item.enable}
               value={item.enable}
-              onChange={(v) => this.enableChange(item, v)}
-              label=""></el-checkbox>
+              onChange={(v) => this.enableChange(item, v)}></el-switch>
           )
           )
         },
         },
         {
         {

src/views/system/sysSecuritySettings.vue

@@ -128,9 +128,9 @@
             <el-button
             <el-button
               size="small"
               size="small"
               @click="sendVerificationCode"
               @click="sendVerificationCode"
-              :disabled="countdownConfig[currentMethod]?.loading">
+              :disabled="countdownConfig[currentMethod] && countdownConfig[currentMethod].loading">
               {{
               {{
-                countdownConfig[currentMethod]?.loading
+                countdownConfig[currentMethod] && countdownConfig[currentMethod].loading
                   ? `${countdownConfig[currentMethod].countdown}s后重发`
                   ? `${countdownConfig[currentMethod].countdown}s后重发`
                   : '发送验证码'
                   : '发送验证码'
               }}
               }}

src/views/user/baseProceedsAccount.vue

@@ -181,8 +181,11 @@
           label="账户类型"
           label="账户类型"
           :contentStyle="{ textAlign: 'center' }">
           :contentStyle="{ textAlign: 'center' }">
           {{
           {{
+            accountTypeList.find(
+              (i) => i.code === detailFormData.accountType
+            ) &&
             accountTypeList.find((i) => i.code === detailFormData.accountType)
             accountTypeList.find((i) => i.code === detailFormData.accountType)
-              ?.remark
+              .remark
           }}
           }}
         </el-descriptions-item>
         </el-descriptions-item>
         <el-descriptions-item label="银行卡开户行">
         <el-descriptions-item label="银行卡开户行">
@@ -196,8 +199,11 @@
         </el-descriptions-item>
         </el-descriptions-item>
         <el-descriptions-item label="收款方式">
         <el-descriptions-item label="收款方式">
           {{
           {{
+            receiverTypeList.find(
+              (i) => i.code === detailFormData.receiverType
+            ) &&
             receiverTypeList.find((i) => i.code === detailFormData.receiverType)
             receiverTypeList.find((i) => i.code === detailFormData.receiverType)
-              ?.remark
+              .remark
           }}
           }}
         </el-descriptions-item>
         </el-descriptions-item>
 
 
@@ -205,9 +211,12 @@
           label="币种"
           label="币种"
           :contentStyle="{ textAlign: 'center' }">
           :contentStyle="{ textAlign: 'center' }">
           {{
           {{
-            currencyTypeList.find(
+            (currencyTypeList.find(
               (i) => i.currencyCode === detailFormData.currencyType
               (i) => i.currencyCode === detailFormData.currencyType
-            )?.currencyName +
+            ) &&
+              currencyTypeList.find(
+                (i) => i.currencyCode === detailFormData.currencyType
+              ).currencyName) +
             '(' +
             '(' +
             detailFormData.currencyType +
             detailFormData.currencyType +
             ')'
             ')'
@@ -215,8 +224,9 @@
         </el-descriptions-item>
         </el-descriptions-item>
         <el-descriptions-item label="主要业务">
         <el-descriptions-item label="主要业务">
           {{
           {{
+            businessTypeList.find((i) => i.key === detailFormData.operation) &&
             businessTypeList.find((i) => i.key === detailFormData.operation)
             businessTypeList.find((i) => i.key === detailFormData.operation)
-              ?.value
+              .value
           }}
           }}
         </el-descriptions-item>
         </el-descriptions-item>
         <el-descriptions-item label="日限额">
         <el-descriptions-item label="日限额">
@@ -329,9 +339,13 @@
             <el-button
             <el-button
               size="small"
               size="small"
               @click="sendVerificationCode"
               @click="sendVerificationCode"
-              :loading="countdownConfig[currentMethod]?.loading">
+              :loading="
+                countdownConfig[currentMethod] &&
+                countdownConfig[currentMethod].loading
+              ">
               {{
               {{
-                countdownConfig[currentMethod]?.loading
+                countdownConfig[currentMethod] &&
+                countdownConfig[currentMethod].loading
                   ? `${countdownConfig[currentMethod].countdown}s后重发`
                   ? `${countdownConfig[currentMethod].countdown}s后重发`
                   : '发送验证码'
                   : '发送验证码'
               }}
               }}
@@ -613,8 +627,8 @@ export default {
           key: 'accountType',
           key: 'accountType',
           width: '100',
           width: '100',
           render: (item) => {
           render: (item) => {
-            return this.accountTypeList.find((i) => i.code === item.accountType)
-              ?.remark
+            const accountType = this.accountTypeList.find((i) => i.code === item.accountType)
+            return accountType && accountType.remark
           }
           }
         },
         },
         {
         {
@@ -669,9 +683,10 @@ export default {
           key: 'receiverType',
           key: 'receiverType',
           width: '150',
           width: '150',
           render: (item) => {
           render: (item) => {
-            return this.receiverTypeList.find(
+            const receiverType = this.receiverTypeList.find(
               (i) => i.code === item.receiverType
               (i) => i.code === item.receiverType
-            )?.remark
+            )
+            return receiverType && receiverType.remark
           }
           }
         },
         },
         {
         {
@@ -680,7 +695,7 @@ export default {
           width: 200,
           width: 200,
           render: (item) => {
           render: (item) => {
             return this.businessTypeList.find((i) => i.key === item.operation)
             return this.businessTypeList.find((i) => i.key === item.operation)
-              ?.value
+              .value || ''
           }
           }
         },
         },
         {
         {