Browse Source

feat: 优化

tangning 2 years ago
parent
commit
b5e0237e44

+ 3 - 1
src/api/sys/user.ts

@@ -7,7 +7,7 @@ import type { AppRouteRecordRaw } from '/@/router/types';
 
 enum Api {
   // Login = '/basic-api/login',
-  Login = '/service/agent/fdLogin',
+  Login = '/service/manage/login',
   Logout = '/service/agent/fdLogout',
   GetUserInfo = '/service/sale/sysUser/getInfo',
   GetPermCode = '/service/sale/sysMenu/getButtonByUserId',
@@ -23,6 +23,8 @@ export function loginApi(params: LoginParams, mode: ErrorMessageMode = 'modal')
       params:{
         ...params,
         phoneNum:params.username,
+        userName:params.username,
+        username:params.username,
         password: encodeStr(window.btoa(params.password))
     },
     },

+ 12 - 13
src/store/modules/user.ts

@@ -102,19 +102,18 @@ export const useUserStore = defineStore({
       try {
         const { goHome = true, mode, ...loginParams } = params;
         console.log('setSessionTimeout',goHome)
-      // const data = await loginApi(loginParams, mode);
-        // const { token, user, agent } = data;
-        // this.setAgent(agent)
-        // this.setUserInfo({
-        //   ...user,
-        //   userId:user.id,
-        //   realName: user.nickName,
-        //   username:user.userName,
-        //   avatar:user.head||'https://q1.qlogo.cn/g?b=qq&nk=339449197&s=640',
-        //   roles:[data.roleId],
-        // });
-        // // save token
-        this.setToken('eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJsb2dpblR5cGUiOiJsb2dpbiIsImxvZ2luSWQiOjEsImRldmljZSI6ImRlZmF1bHQtZGV2aWNlIiwiZWZmIjotMSwicm5TdHIiOiJnOVE0dXNjRnBYc0JoWUtsTlpoS3lJZWo1SHFGNzZmRCIsInVzZXJJZCI6MSwiaXNBZG1pbiI6MSwidXNlck5hbWUiOiJzdXBlci1hZG1pbiIsIm5pY2tOYW1lIjoi6LaF57qn566h55CG5ZGYIn0.2zKzeog-rzCV6-t_JaEg0zFfZM-pKJNnrqSxnVp2fgo');
+      const data = await loginApi(loginParams, mode);
+      console.log('Aa123456',data)
+        const { token, user } = data;
+        this.setToken(token);
+        this.setUserInfo({
+          userId:data.id,
+          realName: data.nickName,
+          username:data.userName,
+          avatar:data.head||'https://q1.qlogo.cn/g?b=qq&nk=339449197&s=640',
+          // roles:[data.roleId],
+        });
+        // save token
         return this.afterLoginAction(goHome);
       } catch (error) {
         return Promise.reject(error);

+ 1 - 1
src/utils/http/axios/index.ts

@@ -52,7 +52,7 @@ const transform: AxiosTransform = {
     const { code, result, message } = data;
 
     // 这里逻辑可以根据项目进行修改
-    const hasSuccess = data && Reflect.has(data, 'code') && code === ResultEnum.SUCCESS;
+    const hasSuccess = data && Reflect.has(data, 'code') && (code === ResultEnum.SUCCESS || code == 0);
     if (hasSuccess) {
       return result ||  data.data;
     }

+ 2 - 2
src/views/work/takingOrdersModel.vue

@@ -28,7 +28,7 @@ export default defineComponent({
   props: {
     userData: { type: Object },
   },
-  emits: ['reload'],
+  emits: ['update'],
   setup(_, { emit }) {
     const modelRef = ref({});
     const schemas: FormSchema[] = [
@@ -199,7 +199,7 @@ export default defineComponent({
           console.log('validate',params,res)
           createMessage.success(t('common.optSuccess'));
           closeModal();
-          emit('reload');
+          emit('update');
       //   },
       // });
     };