Merge branch 'v20' of http://47.101.159.18:3000/Muchinfo/MTP20_WEB_GLOBAL into v20

public/config/appconfig.json

@@ -2,7 +2,7 @@
   "appName": "多元世纪交易中心",
   "version": "1.0.14",
   "versionCode": "100014",
-  "apiUrl": "http://192.168.31.204:8080/cfg?key=test_204",
+  "apiUrl": "http://192.168.31.202:8080/cfg?key=test_202",
   "tradeChannel": "ws",
   "modules": [
     "register",

src/packages/mobile/views/bank/wallet/components/deposit/Index.vue

@@ -119,27 +119,22 @@ const onUploadSuccess = (filePath: string) => {
 /// 提示信息
 const doDepositWarning = () => {
     if (cusBank.value.cusbankid === 'jdjs') {
-        dialog({
-            message: '是否已在银行端进行入金转账？',
-            showCancelButton: true,
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-        }).then(() => {
-            const now = moment(new Date().toISOString()).format('HH:mm')
-            if (now > start && now < end.value) {
+        const now = moment(new Date().toISOString()).format('HH:mm')
+        if (now > start && now < end.value) {
+            dialog({ message: '是否已在银行端进行入金转账？', showCancelButton: true, confirmButtonText: '确认', cancelButtonText: '取消',}).then(() => {
                 /// 提交
                 formSubmit()
-            } else {
-                dialog({
-                    title: '提示',
-                    message: limitMsg,
-                    confirmButtonText: '我知道了'
-                })
-            }
-        }).catch(() => {
-            /// 返回上一层
-            router.back()
-        })
+            }).catch(() => {
+                /// 返回上一层
+                router.back()
+            })
+        } else {
+            dialog({
+                title: '提示',
+                message: limitMsg,
+                confirmButtonText: '我知道了'
+            })
+        }
     } else {
         /// 提交
         formSubmit()

src/packages/pc/views/footer/capital/summary/deposit/index.vue

@@ -71,22 +71,21 @@ const doDepositWarning = () => {
     if (cusBank.value.cusbankid === 'jdjs') {
         formRef.value?.validate((valid) => {
             if (valid) {
-                ElMessageBox.confirm(
+                const now = moment(new Date().toISOString()).format('HH:mm')
+                if (now > start && now < end.value) {
+                    ElMessageBox.confirm(
                     '是否已在银行端进行入金转账？',
                     '提示',
                     { confirmButtonText: '确认', cancelButtonText: '取消', })
                     .then(() => {
-                        const now = moment(new Date().toISOString()).format('HH:mm')
-                        if (now > start && now < end.value) {
-                            /// 提交
-                            formSubmit()
-                        } else {
-                            ElMessageBox.confirm(limitMsg, '提示', { confirmButtonText: '我知道了', showCancelButton: false })
-                        }
+                        formSubmit()
                     }).catch(() => {
                         onCancel()
                     })
-            }
+                } else {
+                    ElMessageBox.confirm(limitMsg, '提示', { confirmButtonText: '我知道了', showCancelButton: false })
+                } 
+            } 
         })
     } else {
         formSubmit()