节假日以通知、公告为准；非交易日请勿操作

public/config/appconfig.json

@@ -2,7 +2,7 @@
   "appId": "com.muchinfo.app",
   "version": "1.0.5",
   "versionCode": "10005",
-  "apiUrl": "http://192.168.31.204:8080/cfg?key=test_204",
+  "apiUrl": "http://192.168.31.175:8080/cfg?key=test_175",
   "modules": [
     "register",
     "delivery"

src/business/bank/index.ts

@@ -297,10 +297,10 @@ export function useDoCusBankExtendConfigs(extendbiztype?: number) {
         if (res.data.length) {
             const data = res.data[0]
             cusBank.value = data
-            /// 不为空
-            const msg_318 = getSystemParamValue('318') ?? ''
+            /// 不为空 入金取 318 出金取 319
+            const msg = getSystemParamValue(extendbiztype === 2 ? '318' : '319') ?? ''
             const msg_013 = getSystemParamValue('013') ?? ''
-            end.value = msg_318 != '' ? msg_318 : msg_013
+            end.value = msg != '' ? msg : msg_013
             /// 查询配置信息
             queryBankCusBankExtendConfigs({
                 data: {

src/packages/gstj/views/holdbank/holddeposit/components/apply/Index.vue

@@ -11,8 +11,12 @@
                             <span>{{ bankaccountno }}</span>
                         </template>
                     </Field>
-                    <Field type="number" v-model="billAmount" label="入金金额" placeholder="请填写入金金额"
-                    :rules="formRules.BillAmount" />
+                    <Field name="BillAmount" :rules="formRules.BillAmount" label="入金金额">
+                        <template #input>
+                            <Stepper v-model="billAmount" theme="round" :min="0.00" :decimal-length="2" :auto-fixed="false" button-size="22" />
+                        </template>
+                    </Field>
+
                     <Field readonly label="金额大写">
                         <template #input>
                             <span>{{ numberToChinese(formatDecimal(billAmount)) }}</span>

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

@@ -15,43 +15,31 @@
                         :placeholder="`请输入${item.fieldname}`" />
                 </template>
             </CellGroup>
-            <CellGroup inset>
-                <Field label="入金时间">
-                    <template #input>
-                        <span style="color: #999;">{{ start }} - {{ end }}</span>
-                    </template>
-                </Field>
-                <Field>
-                    <template #input>
-                        <span style="color: #993333; font-size: 13px;">节假日以通知、公告为准；非交易日请勿操作</span>
-                    </template>
-                </Field>
-            </CellGroup>
-            <CellGroup inset>
-                <Field label="平台入金银行" v-if="msg_320">
-                    <template #input>
-                        <span class="msg_tips" :data-clipboard-text="msg_320" v-copy="onCopy">{{ msg_320 }}</span>
-                    </template>
-                </Field>
-                <Field label="平台入金账号" v-if="msg_321">
-                    <template #input>
-                        <span class="msg_tips" :data-clipboard-text="msg_321" v-copy="onCopy">{{ msg_321 }}</span>
-                    </template>
-                </Field>
-                <Field label="平台入金账户" v-if="msg_322">
-                    <template #input>
-                        <span class="msg_tips" :data-clipboard-text="msg_322" v-copy="onCopy">{{ msg_322 }}</span>
-                    </template>
-                </Field>
-                <Field label="平台入金支行" v-if="msg_323">
-                    <template #input>
-                        <span class="msg_tips" :data-clipboard-text="msg_323" v-copy="onCopy">{{ msg_323 }}</span>
-                    </template>
-                </Field>
-            </CellGroup>
+            <div class="tips_time">
+                <span class="tips">入金时间：交易日 {{ start }} - {{ end }}</span>
+                <span class="tips"><br>节假日以通知、公告为准；非交易日请勿操作！</span>
+            </div>
+            <div class="tips_bank">
+                <div class="tips_bank_row" v-if="msg_320">
+                    <span class="tips_bank_row__label">平台入金银行</span>
+                    <span class="msg_tips" :data-clipboard-text="msg_320" v-copy="onCopy">{{ msg_320 }}</span>
+                </div>
+                <div class="tips_bank_row" v-if="msg_321">
+                    <span class="tips_bank_row__label">平台入金账号</span>
+                    <span class="msg_tips" :data-clipboard-text="msg_321" v-copy="onCopy">{{ msg_321 }}</span>
+                </div>
+                <div class="tips_bank_row" v-if="msg_322">
+                    <span class="tips_bank_row__label">平台入金账户</span>
+                    <span class="msg_tips" :data-clipboard-text="msg_322" v-copy="onCopy">{{ msg_322 }}</span>
+                </div>
+                <div class="tips_bank_row" v-if="msg_323">
+                    <span class="tips_bank_row__label">平台入金支行</span>
+                    <span class="msg_tips" :data-clipboard-text="msg_323" v-copy="onCopy">{{ msg_323 }}</span>
+                </div>
+            </div>
             <CellGroup inset v-if="msg_324">
                 <Cell title="提示" icon="info-o">
-                    <template #label><p style="color: #993333;" v-html="msg_324" /></template>
+                    <template #label><p class="tips" v-html="msg_324" /></template>
                 </Cell>
             </CellGroup>
         </Form>
@@ -65,7 +53,7 @@
 
 <script lang="ts" setup>
 import { shallowRef, ref } from 'vue'
-import { Form, Field, Cell, CellGroup, Button, FieldRule, FormInstance, Icon, showToast, showFailToast } from 'vant'
+import { Form, Field, Cell, CellGroup, Button, FieldRule, FormInstance, showToast, showFailToast } from 'vant'
 import { useDoDeposit, useDoCusBankExtendConfigs } from '@/business/bank'
 import { fullloading, dialog } from '@/utils/vant'
 import { useNavigation } from '@mobile/router/navigation'
@@ -82,7 +70,6 @@ const certificate_photo_url = ref('')
 const userStore = useUserStore()
 
 const start = getSystemParamValue('012') ?? ''
-const limitMsg = getSystemParamValue('1002')
 const msg_320 = getSystemParamValue('320')
 const msg_321 = getSystemParamValue('321')
 const msg_322 = getSystemParamValue('322')
@@ -127,7 +114,7 @@ const doDepositWarning = () => {
         } else {
             dialog({
                 title: '提示',
-                message: limitMsg,
+                message: '入金不在时间范围内',
                 confirmButtonText: '我知道了'
             })
         }

src/packages/mobile/views/bank/wallet/components/deposit/index.less

@@ -30,5 +30,36 @@
 
     .msg_tips {
         color: #0099FF;
+        padding-left: 14px;
+        height: 35px;
+    }
+
+    .tips {
+        color: #993333; 
+        font-size: 12px;
+    }
+
+    .tips_time {
+        background-color: white; 
+        border-radius: 5px; 
+        margin: 10px 15px; 
+        padding: 10px 15px;
+    }
+
+    .tips_bank {
+        display: flex;
+        flex-direction: column;
+        background-color: white; 
+        margin: 0px 15px 10px 15px; 
+        padding: 10px 15px;
+        border-radius: 5px; 
+
+        .tips_bank_row {
+            height: 30px;
+            &__label {
+                font-size: 14px; 
+                color: #333;
+            }
+        }
     }
 }

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

@@ -2,11 +2,6 @@
     <app-view class="g-form bank-wallet-withdraw">
         <Form ref="formRef" class="g-form__container" @submit="doWithDrawWarning">
             <CellGroup inset v-if="cusBank.canoutamount === 1">
-                <Field label="出金时间">
-                    <template #input>
-                        <span style="color: #999;">{{ start }} - {{ end }}</span>
-                    </template>
-                </Field>
                 <Field class="form-field" type="number" label="出金金额" v-model="formData.Amount" :rules="formRules.Amount">
                     <template #input>
                         <input v-model="formData.Amount" placeholder="请填写出金金额" />
@@ -33,7 +28,15 @@
                         :name="item.fieldcode" :label="item.fieldname" v-model="item.value"
                         :placeholder="`请输入${item.fieldname}`" />
                 </template>
-                <p style="padding: 15px; color: #666; font-size: 13px;" v-html="msg_317"></p>
+            </CellGroup>
+            <div class="tips_time">
+                <span class="msg_tips">出金时间：交易日 {{ start }} - {{ end }}</span>
+                <span class="msg_tips"><br>节假日以通知、公告为准；非交易日请勿操作！</span>
+            </div>
+            <CellGroup inset v-if="msg_317">
+                <Cell title="提示" icon="info-o">
+                    <template #label><p class="tips" v-html="msg_317" /></template>
+                </Cell>
             </CellGroup>
             <CellGroup inset v-if="cusBank.canoutamount === 0">
                 <Cell>
@@ -69,7 +72,6 @@ const formRef = shallowRef<FormInstance>()
 const { getSystemParamValue } = useUserStore()
 const start = getSystemParamValue('012') ?? ''
 const msg = getSystemParamValue('302')
-const limitMsg = getSystemParamValue('1002')
 const msg_317 = getSystemParamValue('317')
 const userStore = useUserStore()
 
@@ -104,7 +106,7 @@ const doWithDrawWarning = () => {
         } else {
             dialog({
                 title: '提示',
-                message: limitMsg,
+                message: '出金不在时间范围内',
                 confirmButtonText: '我知道了'
             })
         }

src/packages/mobile/views/bank/wallet/components/withdraw/index.less

@@ -14,4 +14,16 @@
     .g-form__bank {
         padding: 16px;
     }
+
+    .msg_tips {
+        color: #993333; 
+        font-size: 12px;
+    }
+
+    .tips_time {
+        background-color: white; 
+        border-radius: 10px; 
+        margin: 10px 15px; 
+        padding: 10px 15px;
+    }
 }

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

@@ -1,5 +1,15 @@
-.msg_tips {
-    color: #0099FF;
+
+.msg_row {
+    height: 30px;
+
+    .msg_tips {
+        color: #0099FF;
+        padding-left: 14px;
+    }
+    
+    .msg_label {
+        color: #999;
+    }
 }
 
 .el-form-tips {

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

@@ -16,29 +16,34 @@
                     <el-input :name="item.fieldcode" placeholder="请输入" v-model="item.value" />
                 </el-form-item>
             </template>
-            <el-form-item label="入金时间">
-                <span>{{ start }} - {{ end }}</span>
-                <span class="el-form-tips">节假日以通知、公告为准；非交易日请勿操作</span>
-            </el-form-item>
         </el-form>
-        <fieldset style="border: 1px solid #162534; padding: 20px;" v-if="msg_320">
+        <fieldset style="border: 1px solid #162534; padding: 15px;">
+            <legend>入金时间</legend>
+            <span class="el-form-tips">入金时间：交易日 {{ start }} - {{ end }}</span>
+            <span class="el-form-tips" style="margin-bottom: 10px;"><br>节假日以通知、公告为准；非交易日请勿操作！</span>
+        </fieldset>
+        <fieldset style="border: 1px solid #162534; padding: 15px;" v-if="msg_320">
             <legend>入金平台</legend>
-            <el-form class="el-form--vertical" label-width="120px">
-                <el-form-item label="平台入金银行" v-if="msg_320">
+            <div>
+                <div class="msg_row" v-if="msg_320">
+                    <span class="msg_label">平台入金银行</span>
                     <span class="msg_tips" :data-clipboard-text="msg_320" v-copy="onCopy">{{ msg_320 }}</span>
-                </el-form-item>
-                <el-form-item label="平台入金账号" v-if="msg_321">
+                </div>
+                <div class="msg_row" v-if="msg_321">
+                    <span class="msg_label">平台入金账号</span>
                     <span class="msg_tips" :data-clipboard-text="msg_321" v-copy="onCopy">{{ msg_321 }}</span>
-                </el-form-item>
-                <el-form-item label="平台入金银行" v-if="msg_322">
-                    <span class="msg_tips" :data-clipboard-text="msg_323" v-copy="onCopy">{{ msg_322 }}</span>
-                </el-form-item>
-                <el-form-item label="平台入金银行" v-if="msg_323">
+                </div>
+                <div class="msg_row" v-if="msg_322">
+                    <span class="msg_label">平台入金账户</span>
+                    <span class="msg_tips" :data-clipboard-text="msg_322" v-copy="onCopy">{{ msg_322 }}</span>
+                </div>
+                <div class="msg_row" v-if="msg_323">
+                    <span class="msg_label">平台入金支行</span>
                     <span class="msg_tips" :data-clipboard-text="msg_323" v-copy="onCopy">{{ msg_323 }}</span>
-                </el-form-item>
-            </el-form>
+                </div>
+            </div>
         </fieldset>
-        <fieldset style="border: 1px solid #162534;padding: 20px;" v-if="msg_324">
+        <fieldset style="border: 1px solid #162534;padding: 15px;" v-if="msg_324">
             <legend>提示</legend>
             <span class="el-form-tips" v-html="msg_324" />
         </fieldset>
@@ -74,7 +79,6 @@ const certificate_photo_url = ref('')
 const { getSystemParamValue } = useUserStore()
 
 const start = getSystemParamValue('012') ?? ''
-const limitMsg = getSystemParamValue('1002')
 const msg_320 = getSystemParamValue('320')
 const msg_321 = getSystemParamValue('321')
 const msg_322 = getSystemParamValue('322')
@@ -120,7 +124,7 @@ const doDepositWarning = () => {
                         onCancel()
                     })
                 } else {
-                    ElMessageBox.confirm(limitMsg, '提示', { confirmButtonText: '我知道了', showCancelButton: false })
+                    ElMessageBox.confirm('入金不在时间范围内', '提示', { confirmButtonText: '我知道了', showCancelButton: false })
                 } 
             } 
         })

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

@@ -0,0 +1,4 @@
+.el-form-tips {
+    color: #CC6666; 
+    font-size: 13px;
+}

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

@@ -22,15 +22,20 @@
             <el-form-item class="el-form-item--row" label="备注" prop="Remark">
                 <el-input type="textarea" :maxlength="50" :rows="3" v-model="formData.Remark" />
             </el-form-item>
-            <el-form-item label="出金时间:">
-                <span>{{ start }} - {{ end }}</span>
-            </el-form-item>
+            <fieldset style="border: 1px solid #162534; padding: 15px;">
+                <legend>出金时间</legend>
+                <span class="el-form-tips">出金时间：交易日 {{ start }} - {{ end }}</span>
+                <span class="el-form-tips" style="margin-bottom: 10px;"><br>节假日以通知、公告为准；非交易日请勿操作！</span>
+            </fieldset>
             <fieldset style="border: 1px solid #162534;padding: 15px;" v-if="msg_317">
                 <legend>提示</legend>
-                <span style="font-size: 11px; color: #bbb;" v-html="msg_317" />
+                <span class="el-form-tips" v-html="msg_317" />
             </fieldset>
         </el-form>
-        <span v-if="cusBank.canoutamount === 0" v-html="msg" />
+        <fieldset style="border: 1px solid #162534;padding: 15px;" v-if="cusBank.canoutamount === 0">
+            <legend>提示</legend>
+            <span class="el-form-tips" v-html="msg" />
+        </fieldset>
         <template #footer>
             <el-button type="info" @click="onCancel">取消</el-button>
             <el-button v-if="cusBank.canoutamount === 1" type="primary" @click="doWithDrawWarning">提交</el-button>
@@ -58,7 +63,6 @@ const { getSystemParamValue } = useUserStore()
 const msg = getSystemParamValue('302')
 const msg_317 = getSystemParamValue('317')
 const start = getSystemParamValue('012')
-const limitMsg = getSystemParamValue('1002')
 
 const formRules: FormRules = {
     Amount: [{
@@ -93,7 +97,7 @@ const doWithDrawWarning = () => {
                     /// 提交
                     formSubmit()
                 } else {
-                    ElMessageBox.confirm(limitMsg, '提示', { confirmButtonText: '我知道了', showCancelButton: false })
+                    ElMessageBox.confirm('出金不在时间范围内', '提示', { confirmButtonText: '我知道了', showCancelButton: false })
                 }
             }
         })
@@ -141,4 +145,8 @@ const formSubmit = () => {
         }
     })
 }
-</script>
+</script>
+
+<style lang="less">
+@import './index.less';
+</style>