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

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

@@ -62,7 +62,7 @@
             </table>
         </div>
         <template #footer>
-            <div class="g-form__footer inset">
+            <div class="g-form__footer inset" v-if="cusBank.caninamount === 1">
                 <Button round block type="danger" @click="formRef?.submit()">确定</Button>
             </div>
         </template>
@@ -85,7 +85,7 @@ const { router } = useNavigation()
 const { getSystemParamValue } = useUserStore()
 const start = getSystemParamValue('012') ?? ''
 const limitMsg = getSystemParamValue('1002')
-const msg = getSystemParamValue('302')
+const msg = getSystemParamValue('302') ?? '系统错误'
 const { configs, cusBank, end } = useDoCusBankExtendConfigs(2)
 const certificate_photo_url = ref('')
 const userStore = useUserStore()
@@ -126,7 +126,7 @@ const doDepositWarning = () => {
             cancelButtonText: '取消',
         }).then(() => {
             const now = moment(new Date().toISOString()).format('HH:mm')
-            if (now > start && now < end) {
+            if (now > start && now < end.value) {
                 /// 提交
                 formSubmit()
             } else {

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

@@ -37,7 +37,7 @@
             <label>出金时间：{{ start }} - {{ end }}</label>
         </div>
         <template #footer>
-            <div class="g-form__footer inset">
+            <div class="g-form__footer inset" v-if="cusBank.canoutamount === 1">
                 <Button round block type="danger" @click="formRef?.submit()">确定</Button>
             </div>
         </template>
@@ -61,7 +61,7 @@ const { router } = useNavigation()
 const formRef = shallowRef<FormInstance>()
 const { getSystemParamValue } = useUserStore()
 const start = getSystemParamValue('012') ?? ''
-const msg = getSystemParamValue('302')
+const msg = getSystemParamValue('302') ?? '系统错误'
 const limitMsg = getSystemParamValue('1002')
 const userStore = useUserStore()
 
@@ -83,7 +83,7 @@ const formRules: { [key in keyof Proto.t2bBankWithdrawReq]?: FieldRule[] } = {
 const doWithDrawWarning = () => {
     if (cusBank.value.cusbankid === 'jdjs') {
         const now = moment(new Date().toISOString()).format('HH:mm')
-        if (now > start && now < end) {
+        if (now > start && now < end.value) {
             /// 提交
             formSubmit()
         } else {

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

@@ -23,7 +23,7 @@
         <span v-if="cusBank.caninamount === 0">{{ msg }}</span>
         <template #footer>
             <el-button type="info" @click="onCancel">取消</el-button>
-            <el-button type="primary" @click="doDepositWarning">提交</el-button>
+            <el-button v-if="cusBank.caninamount === 1" type="primary" @click="doDepositWarning">提交</el-button>
         </template>
     </app-drawer>
 </template>
@@ -51,7 +51,7 @@ const formRef = ref<FormInstance>()
 const userStore = useUserStore()
 const certificate_photo_url = ref('')
 const { getSystemParamValue } = useUserStore()
-const msg = getSystemParamValue('302')
+const msg = getSystemParamValue('302') ?? '系统错误'
 const start = getSystemParamValue('012') ?? ''
 const limitMsg = getSystemParamValue('1002')
 
@@ -77,8 +77,7 @@ const doDepositWarning = () => {
                     { confirmButtonText: '确认', cancelButtonText: '取消', })
                     .then(() => {
                         const now = moment(new Date().toISOString()).format('HH:mm')
-                        console.log(now)
-                        if (now > start && now < end) {
+                        if (now > start && now < end.value) {
                             /// 提交
                             formSubmit()
                         } else {

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

@@ -29,7 +29,7 @@
         <span v-if="cusBank.canoutamount === 0">{{ msg }}</span>
         <template #footer>
             <el-button type="info" @click="onCancel">取消</el-button>
-            <el-button type="primary" @click="doWithDrawWarning">提交</el-button>
+            <el-button v-if="cusBank.canoutamount === 1" type="primary" @click="doWithDrawWarning">提交</el-button>
         </template>
     </app-drawer>
 </template>
@@ -51,7 +51,7 @@ const { configs, cusBank, end } = useDoCusBankExtendConfigs(3)
 /// 资金账户信息
 const { fund } = useAccountFundInfo()
 const { getSystemParamValue } = useUserStore()
-const msg = getSystemParamValue('302')
+const msg = getSystemParamValue('302') ?? '系统错误'
 const start = getSystemParamValue('012') ?? ''
 const limitMsg = getSystemParamValue('1002')
 
@@ -78,8 +78,7 @@ const doWithDrawWarning = () => {
         formRef.value?.validate((valid) => {
             if (valid) {
                 const now = moment(new Date().toISOString()).format('HH:mm')
-                console.log(now)
-                if (now > start && now < end) {
+                if (now > start && now < end.value) {
                     /// 提交
                     formSubmit()
                 } else {