diff --git a/public/resource/img/modalback.png b/public/resource/img/modalback.png
index 2790458..0c18b8c 100644
Binary files a/public/resource/img/modalback.png and b/public/resource/img/modalback.png differ
diff --git a/src/api/sys/user.ts b/src/api/sys/user.ts
index 5ed47e3..8363cac 100644
--- a/src/api/sys/user.ts
+++ b/src/api/sys/user.ts
@@ -23,6 +23,7 @@ enum Api {
GetPermCode = '/sys/permission/getPermCode',
//新加的获取图形验证码的接口
getInputCode = '/sys/randomImage',
+ randomCode = '/sys/randomInputCode',
//获取短信验证码的接口
getCaptcha = '/sys/sms',
//注册接口
@@ -114,6 +115,10 @@ export function getCodeInfo(currdatetime) {
let url = Api.getInputCode + `/${currdatetime}`;
return defHttp.get({ url: url });
}
+export function randomCode(currdatetime) {
+ let url = Api.randomCode + `/${currdatetime}`;
+ return defHttp.get({ url: url });
+}
/**
* @description: 获取短信验证码
*/
diff --git a/src/components/Form/src/jeecg/components/JImageUpload.vue b/src/components/Form/src/jeecg/components/JImageUpload.vue
index 49ccddf..e347f5e 100644
--- a/src/components/Form/src/jeecg/components/JImageUpload.vue
+++ b/src/components/Form/src/jeecg/components/JImageUpload.vue
@@ -25,9 +25,32 @@
-
- ![example]()
-
+
+
+
+
+ ![]()
+
\ No newline at end of file
diff --git a/src/views/system/user/user.api.ts b/src/views/system/user/user.api.ts
index 795e2e2..d5f8ae8 100644
--- a/src/views/system/user/user.api.ts
+++ b/src/views/system/user/user.api.ts
@@ -236,7 +236,7 @@ export const putCancelQuit = (params, handleSuccess) => {
};
/**
- * 待审批获取列表数据
+ * 待审核获取列表数据
*/
export const getUserTenantPageList = (params) => {
return defHttp.get({ url: Api.getUserTenantPageList, params });
diff --git a/src/views/system/user/user.data.ts b/src/views/system/user/user.data.ts
index 123a351..47da7e8 100644
--- a/src/views/system/user/user.data.ts
+++ b/src/views/system/user/user.data.ts
@@ -511,7 +511,7 @@ export const userTenantColumns: BasicColumn[] = [
if (text === '1') {
return '正常';
} else if (text === '3') {
- return '审批中';
+ return '审核中';
} else {
return '已拒绝';
}