代码调试

components.d.ts

@@ -17,12 +17,11 @@ declare module 'vue' {
     ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
     ElCol: typeof import('element-plus/es')['ElCol']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
-    ElCountdown: typeof import('element-plus/es')['ElCountdown']
     ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
     ElDialog: typeof import('element-plus/es')['ElDialog']
-    ElEmpty: typeof import('element-plus/es')['ElEmpty']
     ElForm: typeof import('element-plus/es')['ElForm']
     ElFormItem: typeof import('element-plus/es')['ElFormItem']
+    ElHeader: typeof import('element-plus/es')['ElHeader']
     ElIcon: typeof import('element-plus/es')['ElIcon']
     ElImage: typeof import('element-plus/es')['ElImage']
     ElInput: typeof import('element-plus/es')['ElInput']
@@ -30,19 +29,16 @@ declare module 'vue' {
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']
-    ElPageHeader: typeof import('element-plus/es')['ElPageHeader']
     ElPagination: typeof import('element-plus/es')['ElPagination']
     ElPopconfirm: typeof import('element-plus/es')['ElPopconfirm']
     ElProgress: typeof import('element-plus/es')['ElProgress']
-    ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
-    ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
     ElRow: typeof import('element-plus/es')['ElRow']
     ElSelect: typeof import('element-plus/es')['ElSelect']
+    ElStep: typeof import('element-plus/es')['ElStep']
+    ElSteps: typeof import('element-plus/es')['ElSteps']
     ElTable: typeof import('element-plus/es')['ElTable']
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
     ElTag: typeof import('element-plus/es')['ElTag']
-    ElTimeline: typeof import('element-plus/es')['ElTimeline']
-    ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
     ElUpload: typeof import('element-plus/es')['ElUpload']
     EquipCard: typeof import('./src/components/equipCard.vue')['default']
     EquipCardHall: typeof import('./src/components/equipCardHall/index.vue')['default']

env/.env.dev

@@ -7,8 +7,8 @@ VITE_API_URL = '/proxyApi'
 # 开发环境接口地址
 # VITE_proxyTarget = 'http://10.40.92.74:8080'  #盛旭
 
-VITE_proxyTarget = 'http://192.168.2.246:28080'  # 马帅
-# VITE_proxyTarget = 'http://192.168.0.244:28580'  # 马帅
+# VITE_proxyTarget = 'http://192.168.2.246:28080'  # 马帅
+VITE_proxyTarget = 'http://192.168.0.244:28580'  # 马帅
 # VITE_proxyTarget = 'http://192.168.2.129:18080'  # 马帅
 
 # VITE_proxyTarget = 'http://10.40.92.185:9206'  # 赵福海 ( 设备类型) 

src/components/header/index.vue

@@ -94,15 +94,17 @@ const onRolesCheck = () => {
 // 选择角色
 const onSelectRoles = (type: number) => {
     if (type === 1) {
-        rolesName.value = '出租方'
+        rolesName.value = '1'
         userStore.editMenuList(1)
         userStore.editUserMenuList(1)
         localStorage.setItem('rolesType', '1')
+        router.replace({ name: 'my-lease' })
     } else {
-        rolesName.value = '承租方'
+        rolesName.value = '2'
         userStore.editMenuList(2)
         userStore.editUserMenuList(2)
         localStorage.setItem('rolesType', '2')
+        router.replace({ name: 'my-lessee' })
     }
     isRolesSelect.value = false
 }
@@ -161,7 +163,16 @@ const onCarts = () => {
                     </div>
                 </div>
                 <div class="header-item">
-                    <a @click="$router.push({ name: 'my-user' })">个人中心</a>
+                    <a
+                        @click="
+                            () => {
+                                rolesName == 1
+                                    ? router.push({ name: 'my-lease' })
+                                    : router.push({ name: 'my-lessee' })
+                            }
+                        "
+                        >个人中心</a
+                    >
                 </div>
                 <div class="header-item last-item">
                     <img src="../../assets/img/home/phone.png" alt="" />

src/layout/header.vue

@@ -14,7 +14,7 @@ const router = useRouter()
 const isRolesSelect = ref<boolean>(false)
 const rolesName = ref<any>('1')
 
-rolesName.value = localStorage.getItem('rolesType') || 1
+rolesName.value = localStorage.getItem('rolesType')
 
 // 是否显示退出登录
 const isShowLogout = computed(() => {
@@ -106,12 +106,12 @@ const onRolesCheck = () => {
 // 选择角色
 const onSelectRoles = (type: number) => {
     if (type === 1) {
-        rolesName.value = '出租方'
+        rolesName.value = '1'
         userStore.editMenuList(1)
         userStore.editUserMenuList(1)
         localStorage.setItem('rolesType', '1')
     } else {
-        rolesName.value = '承租方'
+        rolesName.value = '2'
         userStore.editMenuList(2)
         userStore.editUserMenuList(2)
         localStorage.setItem('rolesType', '2')
@@ -173,7 +173,16 @@ const onCarts = () => {
                     </div>
                 </div>
                 <div class="header-item">
-                    <a @click="$router.push({ name: 'my-user' })">个人中心</a>
+                    <a
+                        @click="
+                            () => {
+                                rolesName == 1
+                                    ? router.push({ name: 'my-lease' })
+                                    : router.push({ name: 'my-lessee' })
+                            }
+                        "
+                        >个人中心</a
+                    >
                 </div>
                 <div class="header-item last-item">
                     <img src="../assets/img/home/phone.png" alt="" />

src/router/index.ts

@@ -469,9 +469,102 @@ const routes: Array<RouteRecordRaw> = [
             keepAlive: false,
             AuthFlag: false
         },
+    },
+
+    // 个人中心改造路由
+    /**
+     * 1. 出租方
+     */
+    {
+        path: '/my-lease', // 主路由地址
+        name: 'my-lease',
+        component: () => import('views/user/index.vue'), // 组件加载
+        meta: {
+            title: '个人中心',
+            keepAlive: false,
+            AuthFlag: false
+        },
+        redirect: '/my-lease/orderManagementCz',
+        children: [
+            {
+                path: 'orderManagementCz',
+                name: 'orderManagementCz',
+                component: () => import('views/user/orderManagementCz/index.vue'),
+                meta: {
+                    title: '订单管理（出租方）',
+                    keepAlive: true,
+                    AuthFlag: false,
+                    isLogin: true
+                },
+            },
+            {
+                path: 'goodsManagement',
+                name: 'goodsManagement',
+                component: () => import('views/user/goodsManagement/index.vue'),
+                meta: {
+                    title: '装备管理',
+                    keepAlive: true,
+                    AuthFlag: false,
+                    isLogin: true
+                },
+            },
+            {
+                path: 'goodsUpdown',
+                name: 'goodsUpdown',
+                component: () => import('views/user/goodsUpdown/index.vue'),
+                meta: {
+                    title: '基础信息',
+                    keepAlive: true,
+                    AuthFlag: false,
+                    isLogin: true
+                },
+            },
+
+
+
+        ]
+    },
+    /**
+    * 2. 承租方
+    */
+    {
+        path: '/my-lessee', // 主路由地址
+        name: 'my-lessee',
+        component: () => import('views/user/index.vue'), // 组件加载
+        meta: {
+            title: '个人中心',
+            keepAlive: false,
+            AuthFlag: false
+        },
+        redirect: '/my-lessee/sourcingNeed',
+        children: [
+            {
+                path: 'sourcingNeed',
+                name: 'sourcingNeed',
+                component: () => import('views/user/sourcingNeed/index.vue'),
+                meta: {
+                    title: '需求管理',
+                    keepAlive: true,
+                    AuthFlag: false,
+                    isLogin: true
+                },
+            },
+            {
+                path: 'orderManagement',
+                name: 'orderManagement',
+                component: () => import('views/user/orderManagement/index.vue'),
+                meta: {
+                    title: '订单管理',
+                    keepAlive: true,
+                    AuthFlag: false,
+                    isLogin: true
+                },
+            },
+        ]
     }
 
 
+
 ]
 
 
@@ -483,6 +576,7 @@ const router = createRouter({
 
 // 使页面跳转后滚动条恢复至顶部
 router.beforeEach((to, from, next) => {
+
     const store = mainStore()
     if (to.meta.isLogin && !to.meta.AuthFlag) {
         if (store.token) {

src/store/user.ts

@@ -26,8 +26,8 @@ export const useStore = defineStore('myUser', {
             leaseAndLesseeList: [],
             leaseAndLesseeUserList: [
                 { title: '订单管理', name: 'orderManagementCz' },
-                { title: '装备管理', name: 'goodsManagement' },
-                // { title: '商品上下架', name: 'goodsUpdown' },
+                { title: '商品管理', name: 'goodsManagement' },
+                { title: '商品上下架', name: 'goodsUpdown' },
                 // { title: '机手管理', name: 'operatorManagement' },
                 // { title: '寻源竞价', name: 'sourcingBidding' },
                 // { title: '专区管理', name: 'zoneManag' },
@@ -144,8 +144,8 @@ export const useStore = defineStore('myUser', {
         editUserMenuList(type: number) {
             const leaseList: any = [
                 { title: '订单管理', name: 'orderManagementCz' },
-                { title: '装备管理', name: 'goodsManagement' },
-                // { title: '商品上下架', name: 'goodsUpdown' },
+                { title: '商品管理', name: 'goodsManagement' },
+                { title: '商品上下架', name: 'goodsUpdown' },
                 // { title: '机手管理', name: 'operatorManagement' },
                 // { title: '寻源竞价', name: 'sourcingBidding' },
                 // { title: '专区管理', name: 'zoneManag' },

src/views/user/index.vue

@@ -46,9 +46,6 @@ const userInfo: any = computed(() => {
 const handleSelect = (name: any, path: any) => {
     store.editcurrentMenuItem(name)
 }
-const activeMenuItem = computed(() => {
-    return store.currentMenuItem
-})
 
 const activeseekingRent = computed(() => {
     return store.currentMenuType
@@ -58,6 +55,10 @@ const menuList: any = computed(() => {
     return store.leaseAndLesseeUserList
 })
 
+const activeMenuItem = computed(() => {
+    return store.leaseAndLesseeUserList[0].name
+})
+
 // watch(route, (newVlaue) => {
 //     if (newVlaue.path.indexOf('myuser') === -1) {
 //         store.editcurrentMenuItem('baseInfo')