1

src/api/equity/index.ts

@@ -1,19 +1,20 @@
 import { defHttp } from '/@/utils/http/axios';
-import { listParams, checkParams, dincrementResult } from './model'
+import { listParams, checkParams, dincrementResult } from './model';
 import { Result } from '/#/axios';
 
 enum Api {
   incrementAdd = '/service/agent/increment/add',
   incrementRenew = '/service/agent/increment/renew',
   checkUserName = '/service/agent/increment/checkUserName',
+  checkjxsUserName = '/service/agent/agentManage/checkUserName',
   listApi = '/service/agent/increment/list',
   allList = '/service/agent/incrementType/allList',
   addDowm = '/service/agent/down/add',
   dowmList = '/service/agent/down/list',
-  cameraIncrementLog = '/service/agent/cameraIncrementLog/list'
+  cameraIncrementLog = '/service/agent/cameraIncrementLog/list',
 }
 
-export const listApi = (params:listParams) =>
+export const listApi = (params: listParams) =>
   defHttp.post<Result>({
     url: Api.listApi,
     params: params,
@@ -24,7 +25,7 @@ export const listApi = (params:listParams) =>
     },
   });
 
-export const dowmListApi = (params:listParams) =>
+export const dowmListApi = (params: listParams) =>
   defHttp.post<Result>({
     url: Api.dowmList,
     params: params,
@@ -35,7 +36,7 @@ export const dowmListApi = (params:listParams) =>
     },
   });
 
-export const addApi = (params:checkParams) =>
+export const addApi = (params: checkParams) =>
   defHttp.post<Result>({
     url: Api.incrementAdd,
     params: params,
@@ -48,15 +49,15 @@ export const addApi = (params:checkParams) =>
 
 //权益延期
 export const dincrementList = (params) =>
-defHttp.get<dincrementResult>({
-  url: Api.allList,
-  params: params,
-  headers: {
-    // @ts-ignore
-    ignoreCancelToken: true,
-  },
-});
-export const renewApi = (params:checkParams) =>
+  defHttp.get<dincrementResult>({
+    url: Api.allList,
+    params: params,
+    headers: {
+      // @ts-ignore
+      ignoreCancelToken: true,
+    },
+  });
+export const renewApi = (params: checkParams) =>
   defHttp.post<Result>({
     url: Api.incrementRenew,
     params: params,
@@ -67,35 +68,46 @@ export const renewApi = (params:checkParams) =>
     },
   });
 
-export const checkUserName = (params:checkParams) =>
-    defHttp.get<Result>({
-      url: Api.checkUserName,
-      params: params,
-      // data: params,
-      headers: {
-        // @ts-ignore
-        ignoreCancelToken: true,
-      },
-});
+export const checkUserName = (params: checkParams) =>
+  defHttp.get<Result>({
+    url: Api.checkUserName,
+    params: params,
+    // data: params,
+    headers: {
+      // @ts-ignore
+      ignoreCancelToken: true,
+    },
+  });
+
+export const checkjxsUserName = (params: checkParams) =>
+  defHttp.post<Result>({
+    url: Api.checkjxsUserName,
+    params: params,
+    // data: params,
+    headers: {
+      // @ts-ignore
+      ignoreCancelToken: true,
+    },
+  });
 
-export const addDowm = (params:checkParams) =>
-    defHttp.post<Result>({
-      url: Api.addDowm,
-      params: params,
-      // data: params,
-      headers: {
-        // @ts-ignore
-        ignoreCancelToken: true,
-      },
-});
+export const addDowm = (params: checkParams) =>
+  defHttp.post<Result>({
+    url: Api.addDowm,
+    params: params,
+    // data: params,
+    headers: {
+      // @ts-ignore
+      ignoreCancelToken: true,
+    },
+  });
 
-export const cameraIncrementLog = (params:checkParams) =>
-    defHttp.post<Result>({
-      url: Api.cameraIncrementLog,
-      params: params,
-      // data: params,
-      headers: {
-        // @ts-ignore
-        ignoreCancelToken: true,
-      },
-});
+export const cameraIncrementLog = (params: checkParams) =>
+  defHttp.post<Result>({
+    url: Api.cameraIncrementLog,
+    params: params,
+    // data: params,
+    headers: {
+      // @ts-ignore
+      ignoreCancelToken: true,
+    },
+  });

src/locales/lang/zh-CN/routes/retailer.ts

@@ -9,8 +9,8 @@ export default {
   jxs: '经销商',
   fxs: '分销商',
   majorAddNum: '专业会员(年)：剩余可售 {value} 年，本次新增 (年数)',
-  highAddNum: '高级会员(月)：剩余可售 {value} 年，本次新增 (月数)',
-  downAddNum: '场景下载(次)：剩余可售 {value} 年，本次新增 (次数)',
+  highAddNum: '高级会员(月)：剩余可售 {value} 月，本次新增 (月数)',
+  downAddNum: '场景下载(次)：剩余可售 {value} 次，本次新增 (次数)',
   ff: '分发',
   allff: '设备批量分发',
   majorTotalNum: '剩余专业会员年数',

src/store/modules/permission.ts

@@ -27,7 +27,7 @@ import { intersection } from 'lodash-es';
 
 interface PermissionState {
   // Permission code list
-  permCodeList: string[] ;
+  permCodeList: string[];
   // Whether the route has been dynamically added
   isDynamicAddedRoute: boolean;
   // To trigger a menu update
@@ -70,7 +70,7 @@ export const usePermissionStore = defineStore({
     setPermCodeList(codeList: string[]) {
       this.permCodeList = codeList;
     },
-    getCheckPerm(value:string|string[]): boolean{
+    getCheckPerm(value: string | string[]): boolean {
       const permCodeList = this.permCodeList;
       if (!value) {
         return false;
@@ -78,7 +78,7 @@ export const usePermissionStore = defineStore({
       if (!isArray(value)) {
         return permCodeList?.includes(value);
       }
-      return (intersection(value, permCodeList)).length > 0;
+      return intersection(value, permCodeList).length > 0;
     },
     setBackMenuList(list: Menu[]) {
       this.backMenuList = list;
@@ -104,7 +104,7 @@ export const usePermissionStore = defineStore({
     },
     async changePermissionCode() {
       const codeList = await getPermCode();
-      const permsList = codeList.map(ele => ele.perms)
+      const permsList = codeList.map((ele) => ele.perms);
       this.setPermCodeList(permsList);
     },
     async buildRoutesAction(): Promise<AppRouteRecordRaw[]> {

src/store/modules/user.ts

@@ -158,7 +158,7 @@ export const useUserStore = defineStore({
         this.setRoleList([RoleEnum.SUPER, RoleEnum.TEST]);
       } else if (agent && agent.parentId) {
         userInfo.roles = [RoleEnum.TEST];
-        this.setRoleList([RoleEnum.SUPER, RoleEnum.TEST]);
+        this.setRoleList([RoleEnum.TEST]);
       } else {
         userInfo.roles = [RoleEnum.SUPER];
         this.setRoleList([RoleEnum.SUPER, RoleEnum.TEST]);

src/views/retailer/AddModal.vue

@@ -25,7 +25,7 @@
   import { uploadApi } from '/@/api/product/index';
   import { useI18n } from '/@/hooks/web/useI18n';
   import { isEmojiCharacter } from '/@/utils';
-  import { checkUserName } from '/@/api/equity';
+  import { checkUserName, checkjxsUserName } from '/@/api/equity';
   import { addApi, updateApi } from '/@/api/retailer';
 
   const { t } = useI18n();
@@ -104,7 +104,7 @@
                 // return Promise.reject(t('routes.equity.rules.userName1'));
                 // }
                 // useThrottleFn(handleSplitLeftMenu, 50);
-                const res = await checkUserName({ userName: value });
+                const res = await checkjxsUserName({ userName: value });
                 // useThrottleFn(,50)()
                 console.log('validator', res);
                 if (!res) {

src/views/retailer/index.vue

@@ -65,7 +65,7 @@
       const permissionStore = usePermissionStore();
       const { getCheckPerm } = permissionStore;
       const searchInfo = reactive<Recordable>({
-        type: 1,
+        // type: 1,
       });
       const [registerAddModal, { openModal: openAddModal }] = useModal();
       const [registerEditModal, { openModal: openEditModal }] = useModal();
@@ -167,7 +167,7 @@
         autoSubmitOnEnter: true,
         schemas: [
           {
-            field: 'version',
+            field: 'agentName',
             label: t('routes.retailer.name'),
             component: 'Input',
             componentProps: {