diff --git a/yudao-ui-admin/.env.prod b/yudao-ui-admin/.env.prod index 46be158eb..1734c6100 100644 --- a/yudao-ui-admin/.env.prod +++ b/yudao-ui-admin/.env.prod @@ -5,7 +5,7 @@ ENV = 'production' VUE_APP_TITLE = 创盈商户管理系统 # 创盈管理系统/生产环境 -VUE_APP_BASE_API = '/prod-api' +VUE_APP_BASE_API = 'https://cmx.bskies.cc:8000/cyyywl-api' # 根据服务器或域名修改 PUBLIC_PATH = 'http://my-pi.com:8888/yudao-admin/' diff --git a/yudao-ui-admin/src/views/system/tenant/index.vue b/yudao-ui-admin/src/views/system/tenant/index.vue index ff70cead4..b3654ebfd 100755 --- a/yudao-ui-admin/src/views/system/tenant/index.vue +++ b/yudao-ui-admin/src/views/system/tenant/index.vue @@ -2,29 +2,31 @@
- - - + + + - - - - - - - - + + - - + + + + + + + + + + + 搜索 @@ -202,11 +204,12 @@ export default { queryParams: { pageNo: 1, pageSize: 10, - name: null, - contactName: null, - contactMobile: null, - status: undefined, - createTime: [] + name: '', + contactName: '', + contactMobile: '', + status: '', + saleContactName: '', + saleContactMobile: '' }, // 表单参数 form: {}, @@ -276,17 +279,7 @@ export default { }, /** 表单重置 */ reset() { - this.form = { - id: undefined, - name: undefined, - packageId: undefined, - contactName: undefined, - contactMobile: undefined, - accountCount: undefined, - expireTime: undefined, - domain: undefined, - status: CommonStatusEnum.ENABLE, - }; + this.form = {} this.resetForm('form'); }, /** 搜索按钮操作 */ @@ -365,23 +358,14 @@ export default { params.pageNo = undefined; params.pageSize = undefined; // 执行导出 - this.$modal.confirm('是否确认导出所有租户数据项?').then(() => { + this.$modal.confirm('是否确认导出所有店铺数据项?').then(() => { this.exportLoading = true; return exportTenantExcel(params); }).then(response => { - this.$download.excel(response, '租户.xls'); + this.$download.excel(response, '店铺.xls'); this.exportLoading = false; }).catch(() => { }); - }, - /** 套餐名格式化 */ - getPackageName(packageId) { - for (const item of this.packageList) { - if (item.id === packageId) { - return item.name; - } - } - return '未知套餐'; } } };