Merge remote-tracking branch 'origin/master' into master

src/api/breg/index.ts

@@ -17,6 +17,15 @@ export const selectBusinessByCustomerName = (name: any) => {
   });
 };
 
+//个人注册
+export const selfRegister = (params: any) => {
+  return request({
+    url: '/customer/pcCustomer/selfRegister',
+    method: 'post',
+    data: params
+  });
+};
+
 //企业注册
 export const registerCustomer = (params: any) => {
   return request({

src/layout/components/header.vue

@@ -23,21 +23,22 @@
           @mouseleave="handleMouseLeave"
         >
           <div class="userInfo-customer">
-            <div class="mr-[5px]">{{ userInfo.customerName || '' }}</div>
+            <div class="mr-[5px]" v-if="userInfo.user.userSonType == 4">{{ userInfo.user.nickName || '' }}</div>
+            <div class="mr-[5px]" v-else>{{ userInfo.customerName || '' }}</div>
             <el-icon>
               <ArrowDown />
             </el-icon>
           </div>
-          <!-- <div class="userInfo-box" @click="onPath('/indexEnterprise')">切换到企业</div> -->
           <div class="userInfo-box">姓名:{{ userInfo.user.nickName }}</div>
           <div class="userInfo-box" @click="onlogout">退出登录</div>
         </div>
         <div v-if="!userInfo.user" class="header-text end" @click="onPath('/login')" style="cursor: pointer">请登录</div>
         <div v-if="!userInfo.user" class="header-text hig" @click="onPath('/breg')">免费注册</div>
         <div v-if="route.path == '/indexEnterprise'" class="header-text" @click="onPath('/')">切换到个人</div>
-        <div v-else class="header-text" @click="onPath('/indexEnterprise')">切换到企业</div>
+        <!-- onPath('/indexEnterprise') -->
+        <div v-else class="header-text" @click="goEnterprise">切换到企业</div>
         <div class="header-text" @click="onPath('/order/orderManage')">我的订单</div>
-        <div class="header-text" @click="onPath('/enterprise/companyInfo')">会员中心</div>
+        <div v-if="userInfo.user && userInfo.user.userSonType != 4" class="header-text" @click="onPath('/enterprise/companyInfo')">会员中心</div>
         <div class="header-text" @click="onPath('/theme?id=1')">人才招聘</div>
         <div class="header-text">帮助中心</div>
         <div class="header-text">在线客服</div>
@@ -75,6 +76,25 @@ const handleMouseLeave = () => {
   userInfoOpen.value = false;
 };
 
+const goEnterprise = () => {
+  if (userInfo.value && userInfo.value.user) {
+    if (userInfo.value.user.userSonType == 4) {
+      ElMessageBox.confirm('您还不是企业用户，是否需要注册', '提示', {
+        confirmButtonText: '注册',
+        type: 'warning'
+      })
+        .then(() => {
+          onPath('/breg');
+        })
+        .catch(() => {});
+    } else {
+      onPath('/indexEnterprise');
+    }
+  } else {
+    onPath('/indexEnterprise');
+  }
+};
+
 /**
  * 获取浏览器定位并转换
  */
@@ -144,11 +164,13 @@ const onlogout = () => {
 
     .header-left {
       height: 40px;
+
       .positioning {
         font-weight: 400;
         font-size: 12px;
         color: #322b2b;
         cursor: pointer;
+
         img {
           height: 18px;
           width: 18px;
@@ -156,8 +178,10 @@ const onlogout = () => {
         }
       }
     }
+
     .header-right {
       display: flex;
+
       .userInfo-bos {
         min-width: 200px;
         padding: 0 14px;
@@ -167,32 +191,38 @@ const onlogout = () => {
         margin-right: 5px;
         overflow: hidden;
         cursor: pointer;
+
         &.open {
           background-color: #ffffff;
           box-shadow: 0px 0px 6px rgba(0, 0, 0, 0.12);
           height: 110px;
           overflow: visible;
+
           .userInfo-customer {
             color: #e7000b;
           }
         }
+
         .userInfo-customer {
           height: 40px;
           display: flex;
           align-items: center;
           justify-content: flex-end;
         }
+
         .userInfo-box {
           color: #999999;
           height: 30px;
           line-height: 30px;
           text-align: right;
           cursor: pointer;
+
           &:hover {
             color: #e7000b;
           }
         }
       }
+
       .header-text {
         padding: 0 14px;
         position: relative;

src/layout/components/workbench.vue

@@ -1,32 +1,38 @@
 <template>
   <div class="workbench-bos" :class="isOpen ? 'workbench-bos1' : 'workbench-bos2'">
+    <!-- 展开状态 -->
     <div class="workbench-box1" v-if="isOpen">
       <div class="workbench-expand1 flex-row-start" @click="onOpen">
         <img src="@/assets/images/layout/workbench.png" alt="" />
         <div>收起菜单</div>
       </div>
-      <div v-for="(item1, index1) in menuList" :key="index1" class="menu-list1" @click="toggleMenu(item1.path)">
-        <div class="menu-head1 flex-row-between">
-          <div class="menu-title1 flex-row-start">
-            <img :src="item1.icon" alt="" />
-            <div>{{ item1.title }}</div>
+      <!-- 修改点1: 增加 v-if="item1.show" 过滤无权限菜单 -->
+      <template v-for="(item1, index1) in menuList" :key="index1">
+        <div class="menu-list1" v-if="item1.show" @click="toggleMenu(item1.path)">
+          <div class="menu-head1 flex-row-between">
+            <div class="menu-title1 flex-row-start">
+              <img :src="item1.icon" alt="" />
+              <div>{{ item1.title }}</div>
+            </div>
+            <el-icon v-if="openedMenus.includes(item1.path)" size="14">
+              <ArrowDown />
+            </el-icon>
+            <el-icon v-else size="14">
+              <ArrowRight />
+            </el-icon>
           </div>
-          <el-icon v-if="openedMenus.includes(item1.path)" size="14"><ArrowDown /></el-icon>
-          <el-icon v-else size="14"><ArrowRight /></el-icon>
-        </div>
-        <div class="menu-item" v-show="openedMenus.includes(item1.path)">
-          <div
-            @click.stop="onPath(item2.path)"
-            v-for="(item2, index2) in item1.children"
-            :key="index2"
-            class="menu-box"
-            :class="{ 'menu-hig': activeMenu == item2.path }"
-          >
-            {{ item2.title }}
+          <div class="menu-item" v-show="openedMenus.includes(item1.path)">
+            <template v-for="(item2, index2) in item1.children" :key="index2">
+              <div @click.stop="onPath(item2.path)" class="menu-box" :class="{ 'menu-hig': activeMenu == item2.path }">
+                {{ item2.title }}
+              </div>
+            </template>
           </div>
         </div>
-      </div>
+      </template>
     </div>
+
+    <!-- 收起状态 -->
     <div v-else class="workbench-box2">
       <div class="workbench-expand2 flex-row-center" @click="onOpen">
         <div class="menu-icon flex-row-center">
@@ -34,30 +40,30 @@
         </div>
       </div>
 
-      <div v-for="(item1, index1) in menuList" :key="index1" class="workbench-expand2 flex-row-center">
-        <el-popover placement="right">
-          <template #reference>
-            <div class="menu-icon flex-row-center" :class="{ 'hig': openedMenus.includes(item1.path) }">
-              <img :src="item1.icon" alt="" />
-            </div>
-          </template>
-          <div class="popover-bos">
-            <div class="popover-title">{{ item1.title }}</div>
-            <div
-              class="popover-list"
-              :class="{ 'popover-hig': activeMenu == item2.path }"
-              v-for="(item2, index2) in item1.children"
-              :key="index2"
-              @click="onPath(item2.path)"
-            >
-              {{ item2.title }}
+      <!-- 修改点2: 增加 v-if="item1.show" 过滤无权限菜单 -->
+      <template v-for="(item1, index1) in menuList" :key="index1">
+        <div class="workbench-expand2 flex-row-center" v-if="item1.show">
+          <el-popover placement="right">
+            <template #reference>
+              <div class="menu-icon flex-row-center" :class="{ 'hig': openedMenus.includes(item1.path) }">
+                <img :src="item1.icon" alt="" />
+              </div>
+            </template>
+            <div class="popover-bos">
+              <div class="popover-title">{{ item1.title }}</div>
+              <template v-for="(item2, index2) in item1.children" :key="index2">
+                <div class="popover-list" :class="{ 'popover-hig': activeMenu == item2.path }" @click="onPath(item2.path)">
+                  {{ item2.title }}
+                </div>
+              </template>
             </div>
-          </div>
-        </el-popover>
-      </div>
+          </el-popover>
+        </div>
+      </template>
     </div>
   </div>
 </template>
+
 <script setup lang="ts">
 import workbench1 from '@/assets/images/layout/workbench1.png';
 import workbench2 from '@/assets/images/layout/workbench2.png';
@@ -66,19 +72,41 @@ import workbench4 from '@/assets/images/layout/workbench4.png';
 import workbench5 from '@/assets/images/layout/workbench5.png';
 import workbench6 from '@/assets/images/layout/workbench6.png';
 import workbench7 from '@/assets/images/layout/workbench7.png';
+import { getWorkbenchMenuList } from '@/api/pc/system/index';
 import { onPath } from '@/utils/siteConfig';
+import { useRouter } from 'vue-router';
+import { getInfo } from '@/api/login';
+import { el } from 'element-plus/es/locale/index.mjs';
+
+const router = useRouter();
 const isOpen = ref(false);
 const openedMenus = ref<string[]>([]);
 const route = useRoute();
 const menuIndex = ref<any>(0);
-const menuList = [
+
+interface MenuItemChild {
+  path: string;
+  title: string;
+}
+
+interface MenuItem {
+  path: string;
+  title: string;
+  icon: string;
+  children?: MenuItemChild[];
+  show?: boolean;
+}
+
+// 注意：这里定义的是完整的全量菜单结构，后续会根据权限动态修改 children 和 show
+const menuList = ref<MenuItem[]>([
   {
     path: '/enterprise',
     title: '企业账户',
     icon: workbench1,
+    show: false,
     children: [
       { path: '/enterprise/companyInfo', title: '企业信息' },
-      { path: '/enterprise/messageNotice', title: '消息通知' },
+      { path: '/enterprise/messageNotice', title: '消息通知' }, // 接口没返这个，应该被过滤
       { path: '/easybuv', title: '地址管理' },
       { path: '/enterprise/invoiceManage', title: '发票抬头管理' },
       { path: '/enterprise/purchasePlan', title: '专属采购方案' },
@@ -92,6 +120,7 @@ const menuList = [
     path: '/order',
     title: '交易管理',
     icon: workbench2,
+    show: false,
     children: [
       { path: '/order/orderManage', title: '订单管理' },
       { path: '/order/orderAudit', title: '审核订单' },
@@ -104,6 +133,7 @@ const menuList = [
     path: '/organization',
     title: '组织管理',
     icon: workbench3,
+    show: false,
     children: [
       { path: '/i', title: '个人信息' },
       { path: '/organization/deptManage', title: '部门管理' },
@@ -117,6 +147,7 @@ const menuList = [
     path: '/cost',
     title: '成本管理',
     icon: workbench4,
+    show: false,
     children: [
       { path: '/cost/itemExpense', title: '分项费用' },
       { path: '/cost/quotaControl', title: '额度控制' }
@@ -126,6 +157,7 @@ const menuList = [
     path: '/reconciliation',
     title: '对账管理',
     icon: workbench5,
+    show: false,
     children: [
       { path: '/reconciliation/billManage', title: '对账单管理' },
       { path: '/reconciliation/invoiceManage', title: '开票管理' }
@@ -135,6 +167,7 @@ const menuList = [
     path: '/valueAdded',
     title: '增值服务',
     icon: workbench6,
+    show: false,
     children: [
       { path: '/valueAdded/maintenance', title: '维保服务' },
       { path: '/valueAdded/complaint', title: '投诉与建议' }
@@ -144,6 +177,7 @@ const menuList = [
     path: '/analysis',
     title: '采购分析',
     icon: workbench7,
+    show: false,
     children: [
       { path: '/analysis/orderAnalysis', title: '订单交易分析' },
       { path: '/analysis/purchaseDetail', title: '商品采购明细' },
@@ -152,22 +186,101 @@ const menuList = [
       { path: '/analysis/deptPurchase', title: '部门采购金额' }
     ]
   }
-];
+]);
 
 const activeMenu = computed(() => route.path);
+const userInfo = ref<any>({});
+
 const onOpen = () => {
   isOpen.value = !isOpen.value;
 };
 
-onMounted(() => {
+const allowedPaths = ref<Set<string>>(new Set());
+
+const processMenuPermissions = (apiMenuList: any[]) => {
+  // 1. 收集接口返回的所有合法 path
+  const paths = new Set<string>();
+  const traverse = (items: any[]) => {
+    items.forEach((item) => {
+      // 统一格式：确保以 / 开头
+      const p = item.path.startsWith('/') ? item.path : `/${item.path}`;
+      paths.add(p);
+      if (item.children && item.children.length > 0) {
+        traverse(item.children);
+      }
+    });
+  };
+  traverse(apiMenuList);
+  allowedPaths.value = paths;
+
+  // 2. 更新本地 menuList：过滤子菜单并设置父级显示状态
+  menuList.value.forEach((menu) => {
+    if (!menu.children) {
+      menu.show = false;
+      return;
+    }
+
+    // 【核心修改】过滤出有权限的子菜单
+    const permittedChildren = menu.children.filter((child) => {
+      const childPath = child.path.startsWith('/') ? child.path : `/${child.path}`;
+      return paths.has(childPath);
+    });
+
+    // 将过滤后的子菜单重新赋值给 menu.children
+    // 这样模板里 v-for 循环时就只有有权限的子项了
+    menu.children = permittedChildren;
+
+    // 如果过滤后还有子菜单，则显示父级；否则隐藏父级
+    menu.show = permittedChildren.length > 0;
+  });
+
+  checkCurrentRoutePermission();
+
+  // 权限处理完后，重新计算展开状态
   initOpenedMenus();
+};
 
+const checkCurrentRoutePermission = () => {
+  const currentPath = route.path;
+  const publicPaths = ['/', '/login', '/404'];
+  if (!publicPaths.includes(currentPath) && !allowedPaths.value.has(currentPath)) {
+    router.push('/');
+  }
+};
+
+onMounted(() => {
   if (window.innerWidth > 1420) {
     isOpen.value = true;
   } else {
     isOpen.value = false;
   }
   window.addEventListener('resize', handleResize);
+
+  getInfo().then((res1) => {
+    if (res1.code == 200) {
+      userInfo.value = res1.data;
+      if (res1.data && res1.data.user?.userSonType == 4) {
+        menuList.value.forEach((item1: any) => {
+          if (item1.path == '/enterprise') {
+            item1.show = false;
+          } else {
+            item1.show = true;
+          }
+          item1.children.forEach((item2: any) => {
+            item2.show = true;
+          });
+        });
+        initOpenedMenus();
+      } else {
+        getWorkbenchMenuList().then((res: any) => {
+          const apiData = res.data || res;
+          if (Array.isArray(apiData)) {
+            processMenuPermissions(apiData);
+          }
+        });
+      }
+    }
+  });
 });
 
 const handleResize = () => {
@@ -178,13 +291,20 @@ const handleResize = () => {
   }
 };
 
-// 根据当前路由自动展开对应的父级菜单
 const initOpenedMenus = () => {
   const currentPath = route.path;
-  for (const menu of menuList) {
-    const hasActiveChild = menu.children?.some((child) => currentPath === child.path || currentPath.startsWith(child.path + '/'));
+  openedMenus.value = [];
+
+  for (const menu of menuList.value) {
+    if (!menu.show) continue;
+
+    // 此时 menu.children 已经是过滤后的干净数据
+    const hasActiveChild = menu.children?.some((child) => {
+      const childPath = child.path.startsWith('/') ? child.path : `/${child.path}`;
+      return currentPath === childPath || currentPath.startsWith(childPath + '/');
+    });
+
     if (hasActiveChild) {
-      // 只展开当前路由对应的菜单
       openedMenus.value = [menu.path];
       return;
     }
@@ -194,10 +314,8 @@ const initOpenedMenus = () => {
 const toggleMenu = (path: string) => {
   const index = openedMenus.value.indexOf(path);
   if (index > -1) {
-    // 如果已展开，则收起
     openedMenus.value.splice(index, 1);
   } else {
-    // 手风琴效果：先收起所有，再展开当前
     openedMenus.value = [path];
   }
 };
@@ -206,11 +324,15 @@ watch(
   () => route.path,
   () => {
     initOpenedMenus();
+    if (userInfo.value && userInfo.value.user.userSonType != 4) {
+      checkCurrentRoutePermission();
+    }
   }
 );
 </script>
 
 <style lang="scss" scoped>
+/* 样式保持不变 */
 .workbench-bos {
   // position: absolute;
   // top: 0;
@@ -221,6 +343,7 @@ watch(
     border-radius: 10px;
     padding: 10px 8px;
     width: 180px;
+
     .workbench-expand1 {
       height: 42px;
       width: 100%;
@@ -228,30 +351,37 @@ watch(
       color: #1d2129;
       padding-left: 12px;
       cursor: pointer;
+
       &:hover {
         color: #e60012;
       }
+
       img {
         height: 16px;
         width: 16px;
         margin-right: 8px;
       }
     }
+
     .menu-list1 {
       width: calc(100% - 24px);
       border-bottom: 1px #e5e6eb solid;
       margin: 0 12px;
+
       &:nth-last-child(1) {
         border-bottom: none;
       }
+
       .menu-head1 {
         height: 54px;
         width: 100%;
         color: #1d2129;
         cursor: pointer;
+
         &:hover {
           color: #e60012;
         }
+
         .menu-title1 {
           font-size: 14px;
 
@@ -262,8 +392,10 @@ watch(
           }
         }
       }
+
       .menu-item {
         padding-bottom: 5px;
+
         .menu-box {
           width: 100%;
           height: 36px;
@@ -273,10 +405,12 @@ watch(
           padding-left: 12px;
           line-height: 36px;
           cursor: pointer;
+
           &.menu-hig {
             background: #f7f8fa;
             color: #e60012;
           }
+
           &:hover {
             color: #e60012;
           }
@@ -291,17 +425,21 @@ watch(
     border-radius: 10px;
     padding: 10px 8px;
     width: 50px;
+
     .workbench-expand2 {
       width: 34px;
       height: 36px;
       cursor: pointer;
       position: relative;
+
       .menu-icon {
         width: 24px;
         height: 24px;
+
         &.hig {
           background-color: #ffe8e8;
         }
+
         img {
           height: 16px;
           width: 16px;
@@ -319,33 +457,12 @@ watch(
         border-radius: 10px;
       }
     }
-    // .workbench-expand2 {
-    //   width: 24px;
-    //   height: 24px;
-    //   cursor: pointer;
-    //   margin: 16px auto;
-    //   position: relative;
-    //   &:hover {
-    //     background-color: #ffe8e8;
-    //   }
-    //   &::after {
-    //     content: '';
-    //     width: 10px;
-    //     height: 1px;
-    //     background-color: #e5e6eb;
-    //     position: absolute;
-    //     left: 7px;
-    //     bottom: -10px;
-    //   }
-    //   img {
-    //     height: 16px;
-    //     width: 16px;
-    //   }
-    // }
   }
+
   &.workbench-bos1 {
     left: -200px;
   }
+
   &.workbench-bos2 {
     left: -70px;
   }
@@ -358,6 +475,7 @@ watch(
     margin-bottom: 7px;
     padding-left: 4px;
   }
+
   .popover-list {
     width: 120px;
     height: 32px;
@@ -366,9 +484,11 @@ watch(
     line-height: 32px;
     padding-left: 4px;
     cursor: pointer;
+
     &:hover {
       color: var(--el-color-primary);
     }
+
     &.popover-hig {
       background: #ffe8e8;
     }

src/router/index.ts

@@ -132,7 +132,7 @@ export const constantRoutes: RouteRecordRaw[] = [
         path: '/reg',
         component: () => import('@/views/reg/index.vue'),
         name: 'Reg',
-        meta: { title: '个人注册', icon: 'dashboard', affix: true, nav: true }
+        meta: { title: '个人注册', header: 'hide', search: 'hide' }
       },
       {
         path: '/breg',

src/views/item/index.vue

@@ -296,13 +296,6 @@ const initData = () => {
   } else {
     getInfoId();
   }
-
-  if (token) {
-    console.log('收藏');
-    getCollection();
-    // 浏览记录
-    addProductBrowsingHistory(id.value).then((res) => {});
-  }
 };
 
 // 商品详情-id
@@ -318,12 +311,18 @@ const getInfoId = () => {
 const getInfoProductNo = () => {
   getProductDetailByNo(productNo.value).then((res) => {
     if (res.code == 200 && res.data) {
+      id.value = res.data.id;
       getInfo(res);
     }
   });
 };
 
 const getInfo = (res: any) => {
+  if (token) {
+    getCollection();
+    // 浏览记录
+    addProductBrowsingHistory(id.value).then((res) => {});
+  }
   carousel.value = [figure];
   if (res.data && res.data.imageUrl) {
     carousel.value = res.data.imageUrl.split(',');

src/views/login.vue

@@ -54,7 +54,8 @@
           <div class="login-text flex-row-between">
             <div @click="handleForgetPassword">忘记密码?</div>
             <div class="border"></div>
-            <div @click="onPath('/breg')">新用户注册</div>
+            <div @click="onPath('/breg')">企业注册</div>
+            <div @click="onPath('/reg')">个人注册</div>
             <!-- <router-link to="/register" class="register-link">新用户注册</router-link> -->
           </div>
         </el-form>
@@ -308,7 +309,7 @@ onMounted(() => {
       .login-text {
         font-size: 14px;
         color: #6a7282;
-        padding: 0 107px;
+        padding: 0 80px;
         margin-top: 14px;
         div {
           cursor: pointer;

src/views/trad/index.vue

@@ -420,6 +420,7 @@ const disabledDate = (date: Date) => {
     .address-bos {
       display: flex;
       gap: 10px 12px;
+      flex-wrap: wrap;
       .address-list {
         width: 291px;
         height: 92px;