diff --git a/src/views/Home/Index.vue b/src/views/Home/Index.vue index 27cb14f..04d16bf 100644 --- a/src/views/Home/Index.vue +++ b/src/views/Home/Index.vue @@ -111,6 +111,7 @@ import * as NoticeApi from '@/api/system/notice' import PanelGroupT from './PanelGroupT.vue' import { formatTime } from '@/utils' import { useUserStore } from '@/store/modules/user' +import avatarImg from '@/assets/imgs/avatar.gif' const userStore = useUserStore() const avatar = userStore.getUser.avatar ? userStore.getUser.avatar : avatarImg const { t } = useI18n() diff --git a/src/views/pay/merchantDetails/MerchantDetailsForm.vue b/src/views/pay/merchantDetails/MerchantDetailsForm.vue index e8e9a9f..f145e13 100644 --- a/src/views/pay/merchantDetails/MerchantDetailsForm.vue +++ b/src/views/pay/merchantDetails/MerchantDetailsForm.vue @@ -13,14 +13,23 @@ + + + + + + - - + + - - + + + + + @@ -84,6 +93,7 @@ const formLoading = ref(false) // 表单的加载中:1)修改时的数据加 const formType = ref('') // 表单的类型:create - 新增;update - 修改 const formData = ref({ detailsId: undefined, + title: '', payType: undefined, appid: undefined, mchId: undefined, @@ -103,8 +113,9 @@ const formData = ref({ }) const formRules = reactive({ payType: [{ required: true, message: '支付类型(支付渠道)不能为空', trigger: 'change' }], + detailsId: [{ required: true, message: '支付id不能为空', trigger: 'change' }], appid: [{ required: true, message: '应用id不能为空', trigger: 'change' }], - mchId: [{ required: true, message: '商户id不能为空', trigger: 'change' }], + title: [{ required: true, message: '商户id不能为空', trigger: 'change' }], notifyUrl: [{ required: true, message: '异步回调地址不能为空', trigger: 'blur' }] }) const formRef = ref() // 表单 Ref @@ -157,6 +168,7 @@ const submitForm = async () => { const resetForm = () => { formData.value = { detailsId: undefined, + title: '', payType: undefined, appid: undefined, mchId: undefined, diff --git a/src/views/pay/merchantDetails/index.vue b/src/views/pay/merchantDetails/index.vue index cf3911d..a959ea9 100644 --- a/src/views/pay/merchantDetails/index.vue +++ b/src/views/pay/merchantDetails/index.vue @@ -25,7 +25,8 @@ - + +