Merge remote-tracking branch 'origin/dev' into wuguojie

# Conflicts:
#	src/api/index.ts
#	src/router/modules/operation.ts

.env.development

@@ -4,8 +4,8 @@ VITE_APP_SETTING = true
 VITE_APP_TITLE = 掌柜运营平台
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = https://test.baoxianzhanggui.com/web-api #默认地址
-#VITE_APP_API_BASEURL = http://192.168.0.53:8001  #田智
-VITE_APP_API_BASEURL = http://192.168.0.106:8001  #屈晨
+VITE_APP_API_BASEURL = http://192.168.0.253:8001  #田智
+# VITE_APP_API_BASEURL = http://192.168.0.106:8001  #屈晨
 #VITE_APP_API_BASEURL = http://192.168.0.59:8001  #徐强
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空

src/api/index.ts

@@ -11,9 +11,9 @@ import roleApi from './modules/role'
 import institutionApi from './modules/institution'
 import areaApi from "./modules/area"
 import operationApi from './modules/operation.ts'
+import menuApi from './modules/menu.ts'
 import commonApi from "./modules/common.ts";
 import teamApi from "@/api/modules/team.ts";
-import menuApi from './modules/menu.ts'
 
 const axiosInstance:ApiInstance = axios.create({
   baseURL: (import.meta.env.DEV && import.meta.env.VITE_OPEN_PROXY === 'true') ? '/proxy/' : import.meta.env.VITE_APP_API_BASEURL,
@@ -96,8 +96,8 @@ const api = {
   institutionApi:institutionApi(axiosInstance),
   areaApi:areaApi(axiosInstance),
   operationApi: operationApi(axiosInstance),
+  menuApi:menuApi(axiosInstance),
   commonApi: commonApi(axiosInstance),
-  teamApi: teamApi(axiosInstance),
-  menuApi:menuApi(axiosInstance)
+  teamApi: teamApi(axiosInstance)
 }
 export default api

src/router/modules/operation.ts

@@ -13,12 +13,13 @@ const routes: RouteRecordRaw = {
   },
   children: [
     {
-      path: 'operationDetail',
+      path: '/operationDetail',
       name: 'OperationDetail',
       component: () => import('@/views/operationManagement/operationDetail.vue'),
       meta: {
         title: '业务员详情',
-        menu: false,
+        sidebar: false,
+        menu:false,
       },
     },
     {

src/store/modules/route.ts

@@ -183,7 +183,7 @@ const useRouteStore = defineStore(
       }).then((res) => {
         // console.log(JSON.parse(res.data.sysConfig))
         // 设置 routes 数据
-        routesRaw.value = formatBackRoutes(JSON.parse(res.data.sysConfig)) as any
+        routesRaw.value = converDeprecatedAttribute(formatBackRoutes(JSON.parse(res.data.sysConfig)) as any)
         // console.log(routesRaw.value,66666)
         isGenerate.value = true
       }).catch(() => {})

src/views/login.vue

@@ -179,6 +179,19 @@ const formType = ref<"login" | "register" | "resetPassword">("login");
     width: 500px;
     transition: height 0.15s ease;
   }
+
+  
+  .fade-enter-active,
+  .fade-leave-active {
+    transition: opacity 0.15s ease;
+  }
+  
+  .fade-enter-from,
+  .fade-leave-to {
+    opacity: 0;
+  }
+ 
+
 }
 .copyright {
   position: absolute;
@@ -196,3 +209,4 @@ const formType = ref<"login" | "register" | "resetPassword">("login");
   opacity: 0;
 }
 </style>
+