fix(bugs): 修改问题和缩略图

src/api/scene/list.ts

@@ -70,7 +70,7 @@ export const generateSceneEditTokenApi = (params: SceneEditParam) =>
       ignoreCancelToken: true,
     },
   });
-export const generateDefaultLiveRoomApi = (params: SceneDownloadParam) => {
+export const generateDefaultLiveRoomApi = (params: SceneDownloadParam) =>
   defHttp.post<Result>({
     url: Api.generateDefaultLiveRoom,
     params,
@@ -79,4 +79,3 @@ export const generateDefaultLiveRoomApi = (params: SceneDownloadParam) => {
       ignoreCancelToken: true,
     },
   });
-};

src/components/Upload/src/helper.ts

@@ -11,7 +11,8 @@ export function checkImgType(file: File) {
 }
 
 export function isImgTypeByName(name: string) {
-  return /\.(jpg|jpeg|png|gif)$/i.test(name);
+  // return /\.(jpg|jpeg|png|gif)$/i.test(name.split('?').shift());
+  return /\.(jpg|jpeg|png|gif)$/i.test(name.split('?').shift());
 }
 
 export function getBase64WithFile(file: File) {

src/locales/lang/zh-CN/common.ts

@@ -30,7 +30,7 @@ export default {
   unNormal: '非正常',
   state: '状态',
   type: '类型',
-  fullName: '姓名',
+  fullName: '员工名称',
   print: '打印',
   all: '全部',
   optSuccess: '操作成功!',

src/utils/http/axios/index.ts

@@ -57,14 +57,14 @@ const transform: AxiosTransform = {
       data &&
       Reflect.has(data, 'code') &&
       (code === ResultEnum.SUCCESS || code === ResultEnum.NORMAL);
-
     if (hasSuccess) {
       const converterResult = data.message;
       const converterMessage = error;
-      data.result = converterResult;
-      data.message = converterMessage;
+      Reflect.set(data, 'result', converterResult);
+      Reflect.set(data, 'message', converterMessage);
+      // data.result = converterResult;
+      // data.message = converterMessage;
       delete data.error;
-
       return data.result || data;
     }
 

src/views/corporation/SubaccountModal.vue

@@ -281,6 +281,7 @@
         insertTableDataRecord({
           nickName: newUser.memoName,
           userName: newUser.phone,
+          phone: newUser.phone,
         });
       }
       return {

src/views/member/list.vue

@@ -92,7 +92,7 @@ weixinOpenid: "oeADe5U9uLeMYsNigq98zdu8J96A"
           width: 60,
         },
         {
-          title: '会员名称',
+          title: '名称',
           dataIndex: 'username',
           sorter: true,
           width: 160,
@@ -140,7 +140,7 @@ weixinOpenid: "oeADe5U9uLeMYsNigq98zdu8J96A"
         schemas: [
           {
             field: 'username',
-            label: '会员名称',
+            label: '名称',
             component: 'Input',
             componentProps: {
               maxLength: 100,

src/views/scenes/downloadModal.vue

@@ -128,6 +128,7 @@
             finishDowloadUrl.value = res.url;
             downloadInfo.isDownloaded = true;
             downloadInfo.status = '获取成功';
+            handleSubmit();
           }
         }, 2000);
       }

src/views/scenes/list.vue

@@ -273,6 +273,7 @@
         let res = await generateDefaultLiveRoomApi({
           sceneNum: record.num,
         });
+        console.log('generateDefaultLiveRoom', res);
         if (res) {
           createMessage.success(t('common.optSuccess'));
           reload();

src/views/staff/list.vue

@@ -80,13 +80,13 @@
           dataIndex: 'companyName',
           width: 160,
         },
+        // {
+        //   title: t('routes.staff.userName'),
+        //   dataIndex: 'userName',
+        //   width: 80,
+        // },
         {
           title: t('routes.staff.userName'),
-          dataIndex: 'userName',
-          width: 80,
-        },
-        {
-          title: t('routes.staff.nickName'),
           dataIndex: 'nickName',
           width: 80,
         },
@@ -155,6 +155,10 @@
         showIndexColumn: false,
         rowKey: 'id',
         pagination: { pageSize: 20 },
+        afterFetch: (T) => {
+          console.log('afterFetch', T);
+          return T;
+        },
         bordered: true,
         sortFn: (sortInfo) => {
           return { ...sortInfo, sidx: sortInfo.field, order: sortInfo.order.replace('end', '') };

src/views/system/account/AccountModal.vue

@@ -39,20 +39,6 @@
             ...data.record,
           });
         }
-
-        // const treeData = await roleSelectListApi();
-        // const tData = (await getDeptList()) as any as TreeMenuNode[];
-        // const treeData = makeMenuTree(tData);
-        // updateSchema([
-        //   {
-        //     field: 'pwd',
-        //     show: !unref(isUpdate),
-        //   },
-        //   {
-        //     field: 'dept',
-        //     componentProps: { treeData },
-        //   },
-        // ]);
       });
 
       const getTitle = computed(() => (!unref(isUpdate) ? '新增账号' : '编辑账号'));

src/views/system/account/account.data.ts

@@ -1,11 +1,13 @@
-// isAccountExist
-import { roleSelectListApi, checkUserApi } from '/@/api/system/system';
+// isAccountExist checkUserApi
+import { roleSelectListApi } from '/@/api/system/system';
 import { BasicColumn } from '/@/components/Table';
 import { FormSchema } from '/@/components/Table';
+import { useI18n } from '/@/hooks/web/useI18n';
 import { h } from 'vue';
 // import { Switch } from 'ant-design-vue';
 import { Time } from '/@/components/Time';
-import { isBoolean } from '/@/utils/is';
+// import { isBoolean } from '/@/utils/is';
+const { t } = useI18n();
 
 export const columns: BasicColumn[] = [
   {
@@ -71,6 +73,7 @@ export const accountFormSchema: FormSchema[] = [
     field: 'userName',
     label: '用户名',
     component: 'Input',
+    required: true,
     // helpMessage: ['本字段演示异步验证', '不能输入带有admin的用户名'],
     // rules: [
     //   {
@@ -101,12 +104,13 @@ export const accountFormSchema: FormSchema[] = [
     label: '角色',
     field: 'roleId',
     component: 'ApiSelect',
+    // component: 'ApiRadioGroup',
     componentProps: {
       api: roleSelectListApi,
       labelField: 'roleName',
       valueField: 'roleId',
     },
-    required: false,
+    required: true,
   },
   // {
   //   field: 'dept',
@@ -133,44 +137,78 @@ export const accountFormSchema: FormSchema[] = [
     field: 'phone',
     label: '手机号',
     component: 'Input',
-    required: false,
+    required: true,
     helpMessage: ['验证提示', '手机号需在指房宝APP注册后才可新增'],
-    itemProps: {
-      validateTrigger: 'blur',
-    },
     rules: [
       {
-        required: false,
+        required: true,
         message: '请输入手机号',
       },
       {
-        validator(_, value) {
-          return new Promise(async (resolve, reject) => {
-            try {
-              const res = await checkUserApi({
-                phone: value || '',
-              });
+        required: true,
+        // @ts-ignore
+        validator: async (rule, value) => {
+          const reg_tel =
+            /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/;
+          // var reg = /\S+@\S+\.\S+/;
+          if (!value) {
+            /* eslint-disable-next-line */
 
-              isBoolean(res) && res ? resolve() : reject('用户不存在');
-            } catch (error) {
-              reject(error.message || '用户不存在');
-            }
-          });
+            return Promise.reject(t('common.phone'));
+          }
+          if (!reg_tel.test(value)) {
+            /* eslint-disable-next-line */
+            return Promise.reject(t('common.phoneError'));
+          }
+          return Promise.resolve();
         },
+        trigger: 'change',
       },
+      // {
+      //   validator(_, value) {
+      //     return new Promise(async (resolve, reject) => {
+      //       try {
+      //         const res = await checkUserApi({
+      //           phone: value || '',
+      //         });
+
+      //         isBoolean(res) && res ? resolve() : reject('用户不存在');
+      //       } catch (error) {
+      //         reject(error.message || '用户不存在');
+      //       }
+      //     });
+      //   },
+      // },
     ],
   },
-
+  {
+    field: 'rec_status',
+    label: '状态',
+    component: 'RadioGroup',
+    required: true,
+    defaultValue: 1,
+    componentProps: {
+      options: [
+        {
+          value: 1,
+          label: '正常',
+        },
+        {
+          value: 0,
+          label: '禁用',
+        },
+      ],
+    },
+  },
   // {
   //   label: '邮箱',
   //   field: 'email',
   //   component: 'Input',
   //   required: true,
   // },
-
-  {
-    label: '备注',
-    field: 'remark',
-    component: 'InputTextArea',
-  },
+  // {
+  //   label: '备注',
+  //   field: 'remark',
+  //   component: 'InputTextArea',
+  // },
 ];