Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud

src/api/admin/user.ts

@@ -1,94 +1,95 @@
-import request from '/@/utils/request';
+import request from "/@/utils/request"
 
 export const list = () => {
 	return request({
-		url: '/admin/user/list',
-		method: 'get',
-	});
-};
+		url: "/admin/user/list",
+		method: "get",
+	})
+}
+
 export const pageList = (params?: Object) => {
 	return request({
-		url: '/admin/user/page',
-		method: 'get',
+		url: "/admin/user/page",
+		method: "get",
 		params,
-	});
-};
+	})
+}
 
 export const addObj = (obj: Object) => {
 	return request({
-		url: '/admin/user',
-		method: 'post',
+		url: "/admin/user",
+		method: "post",
 		data: obj,
-	});
-};
+	})
+}
 
 export const getObj = (id: String) => {
 	return request({
-		url: '/admin/user/details/' + id,
-		method: 'get',
-	});
-};
+		url: "/admin/user/details/" + id,
+		method: "get",
+	})
+}
 
 export const delObj = (ids: Object) => {
 	return request({
-		url: '/admin/user',
-		method: 'delete',
+		url: "/admin/user",
+		method: "delete",
 		data: ids,
-	});
-};
+	})
+}
 
 export const putObj = (obj: Object) => {
 	return request({
-		url: '/admin/user',
-		method: 'put',
+		url: "/admin/user",
+		method: "put",
 		data: obj,
-	});
-};
+	})
+}
 
 export function getDetails(obj: Object) {
 	return request({
-		url: '/admin/user/details',
-		method: 'get',
+		url: "/admin/user/details",
+		method: "get",
 		params: obj,
-	});
+	})
 }
 
 // 更改个人信息
 export function editInfo(obj: Object) {
 	return request({
-		url: '/admin/user/personal/edit',
-		method: 'put',
+		url: "/admin/user/personal/edit",
+		method: "put",
 		data: obj,
-	});
+	})
 }
 
 // 更改个人密码
 export function password(obj: Object) {
 	return request({
-		url: '/admin/user/personal/password',
-		method: 'put',
+		url: "/admin/user/personal/password",
+		method: "put",
 		data: obj,
-	});
+	})
 }
 
 export function unbindingUser(type) {
 	return request({
-		url: '/admin/user/unbinding',
-		method: 'post',
+		url: "/admin/user/unbinding",
+		method: "post",
 		params: {
 			type,
 		},
-	});
+	})
 }
 
 export function checkPassword(password: string) {
 	return request({
-		url: '/admin/user/check',
-		method: 'post',
+		url: "/admin/user/check",
+		method: "post",
 		params: {
 			password,
 		},
-	});
+	})
 }
 
 /**
@@ -96,50 +97,50 @@ export function checkPassword(password: string) {
  */
 export const registerUser = (userInfo: object) => {
 	return request({
-		url: '/admin/register/user',
-		method: 'post',
+		url: "/admin/register/user",
+		method: "post",
 		data: userInfo,
-	});
-};
+	})
+}
 
 export const resetUserPassword = (userInfo: object) => {
 	return request({
-		url: '/admin/register/password',
-		method: 'post',
+		url: "/admin/register/password",
+		method: "post",
 		data: userInfo,
-	});
-};
+	})
+}
 
 export function validateUsername(rule: any, value: any, callback: any, isEdit: boolean) {
-	const flag = new RegExp(/^([a-z\d]+?)$/).test(value);
+	const flag = new RegExp(/^([a-z\d]+?)$/).test(value)
 	if (!flag) {
-		callback(new Error('用户名支持小写英文、数字'));
+		callback(new Error("用户名支持小写英文、数字"))
 	}
 
 	if (isEdit) {
-		return callback();
+		return callback()
 	}
 
 	getDetails({ username: value }).then((response) => {
-		const result = response.data;
+		const result = response.data
 		if (result !== null) {
-			callback(new Error('用户名已经存在'));
+			callback(new Error("用户名已经存在"))
 		} else {
-			callback();
+			callback()
 		}
-	});
+	})
 }
 
 export function validatePhone(rule: any, value: any, callback: any, isEdit: boolean) {
 	if (isEdit) {
-		return callback();
+		return callback()
 	}
 	getDetails({ phone: value }).then((response) => {
-		const result = response.data;
+		const result = response.data
 		if (result !== null) {
-			callback(new Error('手机号已经存在'));
+			callback(new Error("手机号已经存在"))
 		} else {
-			callback();
+			callback()
 		}
-	});
+	})
 }

src/api/admin/userFace.ts

@@ -1,49 +1,56 @@
 import request from "/@/utils/request"
 
+export const putGlobalFace = (obj: Object) => {
+	return request({
+		url: "/admin/user-face/global-face",
+		method: "post",
+		data: obj,
+	})
+}
+
 export function pageJoin(query?: Object) {
-  return request({
-    url: '/admin/user-face/page-join',
-    method: 'get',
-    params: query
-  })
+	return request({
+		url: "/admin/user-face/page-join",
+		method: "get",
+		params: query,
+	})
 }
 
 export function fetchList(query?: Object) {
-  return request({
-    url: '/admin/user-face/page',
-    method: 'get',
-    params: query
-  })
+	return request({
+		url: "/admin/user-face/page",
+		method: "get",
+		params: query,
+	})
 }
 
 export function addObj(obj?: Object) {
-  return request({
-    url: '/admin/user-face',
-    method: 'post',
-    data: obj
-  })
+	return request({
+		url: "/admin/user-face",
+		method: "post",
+		data: obj,
+	})
 }
 
 export function getObj(id?: string) {
-  return request({
-    url: '/admin/user-face/' + id,
-    method: 'get'
-  })
+	return request({
+		url: "/admin/user-face/" + id,
+		method: "get",
+	})
 }
 
 export function delObjs(ids?: Object) {
-  return request({
-    url: '/admin/user-face',
-    method: 'delete',
-    data: ids
-  })
+	return request({
+		url: "/admin/user-face",
+		method: "delete",
+		data: ids,
+	})
 }
 
 export function putObj(obj?: Object) {
-  return request({
-    url: '/admin/user-face',
-    method: 'put',
-    data: obj
-  })
+	return request({
+		url: "/admin/user-face",
+		method: "put",
+		data: obj,
+	})
 }
-

src/api/hard/hard-group.ts

@@ -0,0 +1,48 @@
+import request from "/@/utils/request"
+
+export function pageJoin(query?: Object) {
+	return request({
+		url: "/hard/hard-group/page-join",
+		method: "get",
+		params: query,
+	})
+}
+
+export function fetchList(query?: Object) {
+	return request({
+		url: "/hard/hard-group/page",
+		method: "get",
+		params: query,
+	})
+}
+
+export function addObj(obj?: Object) {
+	return request({
+		url: "/hard/hard-group",
+		method: "post",
+		data: obj,
+	})
+}
+
+export function getObj(id?: string) {
+	return request({
+		url: "/hard/hard-group/" + id,
+		method: "get",
+	})
+}
+
+export function delObjs(ids?: Object) {
+	return request({
+		url: "/hard/hard-group",
+		method: "delete",
+		data: ids,
+	})
+}
+
+export function putObj(obj?: Object) {
+	return request({
+		url: "/hard/hard-group",
+		method: "put",
+		data: obj,
+	})
+}