Handy_Cao 1 éve
szülő
commit
fb02b1f008

+ 5 - 2
src/packages/mobile/views/bank/wallet/components/deposit/Index.vue

@@ -110,8 +110,11 @@ const onUploadSuccess = (filePath: string) => {
 /// 提示信息
 const doDepositWarning = () => {
     if (cusBank.value.cusbankid === 'jdjs') {
-        const now = moment(new Date().toISOString()).format('HH:mm')
-        if (now > start && now < end.value) {
+        const now = moment().format('HH:mm')
+        const n = moment(now, 'HH:mm')
+        const s = moment(start, 'HH:mm')
+        const e = moment(end.value, 'HH:mm')
+        if (n.isAfter(s) && n.isBefore(e)) {
             dialog({ message: '是否已在银行端进行入金转账?', showCancelButton: true, confirmButtonText: '确认', cancelButtonText: '取消', }).then(() => {
                 /// 提交
                 formSubmit()

+ 7 - 3
src/packages/mobile/views/bank/wallet/components/withdraw/Index.vue

@@ -67,7 +67,7 @@ const { fund } = useAccountFundInfo()
 const { router } = useNavigation()
 const formRef = shallowRef<FormInstance>()
 const { getSystemParamValue } = useUserStore()
-const start = getSystemParamValue('012')
+const start = getSystemParamValue('012') ?? ''
 const msg = getSystemParamValue('302')
 const limitMsg = getSystemParamValue('1002')
 const msg_317 = getSystemParamValue('317')
@@ -93,8 +93,12 @@ const formRules: { [key: string]: FieldRule[] } = {
 /// 提示信息
 const doWithDrawWarning = () => {
     if (cusBank.value.cusbankid === 'jdjs') {
-        const now = moment(new Date().toISOString()).format('HH:mm')
-        if (now > start && now < end.value) {
+        const now = moment().format('HH:mm')
+        const n = moment(now, 'HH:mm')
+        const s = moment(start, 'HH:mm')
+        const e = moment(end.value, 'HH:mm')
+        // 出金时间必须在开始和结束时间之间
+        if (n.isAfter(s) && n.isBefore(e)) {
             /// 提交
             formSubmit()
         } else {

+ 5 - 2
src/packages/pc/views/footer/capital/summary/deposit/index.vue

@@ -105,8 +105,11 @@ const doDepositWarning = () => {
     if (cusBank.value.cusbankid === 'jdjs') {
         formRef.value?.validate((valid) => {
             if (valid) {
-                const now = moment(new Date().toISOString()).format('HH:mm')
-                if (now > start && now < end.value) {
+                const now = moment().format('HH:mm')
+                const n = moment(now, 'HH:mm')
+                const s = moment(start, 'HH:mm')
+                const e = moment(end.value, 'HH:mm')
+                if (n.isAfter(s) && n.isBefore(e)) {
                     ElMessageBox.confirm(
                     '是否已在银行端进行入金转账?',
                     '提示',