diff --git a/src/api/system/tenant/types.ts b/src/api/system/tenant/types.ts index f5628ef..cc834ab 100644 --- a/src/api/system/tenant/types.ts +++ b/src/api/system/tenant/types.ts @@ -39,6 +39,7 @@ export interface TenantForm { id: number | string | undefined; tenantId: number | string | undefined; username: string; + bearFeeFlag: number | string | undefined; joinTime: string; type: number; mchtcode: string; diff --git a/src/views/account/index.vue b/src/views/account/index.vue index 81543e2..e915669 100644 --- a/src/views/account/index.vue +++ b/src/views/account/index.vue @@ -34,6 +34,7 @@ v-model:limit="queryParams.size" @pagination="getListList" /> + diff --git a/src/views/agent/index.vue b/src/views/agent/index.vue index 77b5258..d9197e7 100644 --- a/src/views/agent/index.vue +++ b/src/views/agent/index.vue @@ -117,7 +117,8 @@ - + + @@ -165,7 +166,6 @@ - diff --git a/src/views/darren/index.vue b/src/views/darren/index.vue index 9b4c8d6..c1bc91b 100644 --- a/src/views/darren/index.vue +++ b/src/views/darren/index.vue @@ -91,8 +91,7 @@ - - + diff --git a/src/views/darrenorder/index.vue b/src/views/darrenorder/index.vue index 1633ab2..3c2e11c 100644 --- a/src/views/darrenorder/index.vue +++ b/src/views/darrenorder/index.vue @@ -27,7 +27,7 @@ - + @@ -36,8 +36,7 @@ - - + diff --git a/src/views/darrenuser/index.vue b/src/views/darrenuser/index.vue index 1796b9c..2df1e89 100644 --- a/src/views/darrenuser/index.vue +++ b/src/views/darrenuser/index.vue @@ -41,7 +41,7 @@ - + diff --git a/src/views/promotion/index.vue b/src/views/promotion/index.vue index 35a6ef9..e12e288 100644 --- a/src/views/promotion/index.vue +++ b/src/views/promotion/index.vue @@ -96,8 +96,8 @@ - - + + diff --git a/src/views/system/divide/index.vue b/src/views/system/divide/index.vue index 2ae4223..7380190 100644 --- a/src/views/system/divide/index.vue +++ b/src/views/system/divide/index.vue @@ -61,7 +61,8 @@ - + + @@ -362,7 +363,6 @@ const data = reactive>({ const { queryParams, form, rules } = toRefs(data); - /** 查询租户列表 */ const getList = async () => { loading.value = true; diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue index f43448b..f6d8feb 100644 --- a/src/views/system/tenant/index.vue +++ b/src/views/system/tenant/index.vue @@ -132,9 +132,8 @@ - - - + + @@ -404,6 +403,14 @@ + + + + + + + + @@ -620,6 +627,9 @@ {{ signfun(tenantForm.signStatus) }} + + {{ tenantForm.bearFeeFlag==1?'是':'否' }} + @@ -841,6 +851,7 @@ const initFormData: TenantForm = { status: '0', //是否启用状态 businessLicense: '', //营业执照号 idCard: '', //负责人证件信息/身份证号 + bearFeeFlag: '', //是否承担手续费 bankCard: '', //开户卡账号 bankType: '', //开户行类型 bankName: '', //开户行名称 @@ -869,8 +880,6 @@ const initFormData: TenantForm = { const data = reactive>({ form: { ...initFormData }, queryParams: { - pageSize: 10, - pageNum: 1, current: 1, size: 10, type: 2, diff --git a/src/views/trade/chargeManage/index.vue b/src/views/trade/chargeManage/index.vue index b35a7a3..d3e4f30 100644 --- a/src/views/trade/chargeManage/index.vue +++ b/src/views/trade/chargeManage/index.vue @@ -73,8 +73,8 @@ diff --git a/src/views/ums/member/index.vue b/src/views/ums/member/index.vue index 934f564..2e5c5f7 100644 --- a/src/views/ums/member/index.vue +++ b/src/views/ums/member/index.vue @@ -340,8 +340,8 @@