样式优化

src/layout/components/nav.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 导航组件 -->
-  <div class="nav-pages">
+  <div class="nav-pages" :class="meta.info ? 'nav-pages1' : ''">
     <div class="nav-bos" :style="{ 'max-width': route.path == '/item' ? '1600px' : '1500px' }" @mouseleave="leaveClassify">
       <div class="nav-all flex-row-start" @mouseenter="openClassify">
         <img src="@/assets/images/layout/layout2.png" alt="" />
@@ -71,6 +71,9 @@ const navList = ref<any>([
   { title: '解决方案', url: '/plan' },
   { title: '特价专区', url: '/search/special' }
 ]);
+const props = defineProps<{
+  meta?: any;
+}>();
 
 onMounted(async () => {
   // 获取分类
@@ -121,7 +124,7 @@ const leaveClassify = () => {
     display: flex;
     position: relative;
     padding-top: 15px;
-    justify-content: center;
+    // justify-content: center;
 
     .nav-all {
       width: 234px;
@@ -131,8 +134,8 @@ const leaveClassify = () => {
       font-size: 15px;
       color: #ffffff;
       cursor: pointer;
-      position: absolute;
-      left: 0;
+      // position: absolute;
+      // left: 0;
 
       img {
         height: 16px;
@@ -287,5 +290,18 @@ const leaveClassify = () => {
       }
     }
   }
+
+  &.nav-pages1 {
+    .nav-bos {
+      width: 1200px;
+      min-width: 0;
+      max-width: 1200px;
+      @media (min-width: 1600px) {
+        width: 1600px;
+        min-width: 0;
+        max-width: 1600px;
+      }
+    }
+  }
 }
 </style>

src/layout/components/search.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 搜索组件 -->
-  <div class="search-bos" :style="{ 'background': meta.workbench ? '#F4F4F4' : '#ffffff' }">
+  <div :class="meta.info ? 'search-bos1' : ''" class="search-bos" :style="{ 'background': meta.workbench ? '#F4F4F4' : '#ffffff' }">
     <div class="search-content">
       <img @click="onPath('/')" class="logo logo2" v-if="route.path == '/indexMro'" src="@/assets/images/mro.png" alt="" />
       <img @click="onPath('/')" class="logo logo2" v-else-if="route.path == '/indexFuli'" src="@/assets/images/fuli.png" alt="" />
@@ -93,6 +93,17 @@ getSearchTitle(1).then((res) => {
     padding: 0 30px;
   }
 
+  &.search-bos1 {
+    .search-content {
+      min-width: 1200px;
+      max-width: 1200px;
+      @media (min-width: 1600px) {
+        min-width: 1600px;
+        max-width: 1600px;
+      }
+    }
+  }
+
   .logo {
     cursor: pointer;
     border-radius: 4px;

src/layout/index.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="app-wrapper">
     <Header v-if="meta.header != 'hide'" />
-    <Search v-if="meta.search != 'hide'" />
-    <Nav v-if="meta.nav" />
+    <Search v-if="meta.search != 'hide'" :meta="meta" />
+    <Nav v-if="meta.nav" :meta="meta" />
     <Breadcrumb v-if="meta.breadcrumb" />
     <div class="pages-bos" :class="meta.workbench ? 'pages-bos1' : 'pages-bos2'" :style="{ minHeight: boxHeight }">
       <Workbench ref="WorkbenchRef" v-if="meta.workbench" />

src/router/index.ts

@@ -168,7 +168,7 @@ export const constantRoutes: RouteRecordRaw[] = [
         path: '/item',
         component: () => import('@/views/item/index.vue'),
         name: 'Item',
-        meta: { title: '商品详情', nav: true, breadcrumbColor: '#F4F4F4' }
+        meta: { title: '商品详情', nav: true, breadcrumbColor: '#F4F4F4', info: true }
       },
       {
         path: '/itemPreview',

src/views/cart/index.vue

@@ -22,13 +22,16 @@
         <el-table-column type="selection" width="55" />
         <el-table-column label="商品信息" minWidth="490">
           <template #default="scope">
-            <div class="cart-info">
+            <div class="cart-info" @click="onPath('/item?id=' + scope.row.shoppingCartId + '&productNo=' + scope.row.productNo)">
               <img class="cart-img" :src="scope.row.productImage" alt="" />
               <div class="cart-text">
                 <div class="text1">{{ scope.row.itemName }}</div>
                 <div class="text2">
                   <span>单位:{{ scope.row.unitName }}</span>
                 </div>
+                <div class="text2">
+                  <span>编号:{{ scope.row.productNo }}</span>
+                </div>
               </div>
             </div>
           </template>
@@ -77,13 +80,16 @@
         <el-table-column type="selection" width="55" />
         <el-table-column label="商品信息" minWidth="490">
           <template #default="scope">
-            <div class="cart-info">
+            <div class="cart-info" @click="onPath('/item?id=' + scope.row.shoppingCartId + '&productNo=' + scope.row.productNo)">
               <img class="cart-img" :src="scope.row.productImage" alt="" />
               <div class="cart-text">
                 <div class="text1">{{ scope.row.itemName }}</div>
                 <div class="text2">
                   <span>单位:{{ scope.row.unitName }}</span>
                 </div>
+                <div class="text2">
+                  <span>编号:{{ scope.row.productNo }}</span>
+                </div>
                 <!-- <div class="text3">当前商品库存不足，当前库存量：0</div> -->
               </div>
             </div>
@@ -366,6 +372,7 @@ const handleChange = (row: any) => {
     width: 490px;
     height: 94px;
     display: flex;
+    cursor: pointer;
     .cart-img {
       width: 94px;
       height: 94px;

src/views/home/jdcomponents/JDProducts.vue

@@ -261,7 +261,10 @@ const handlePageScroll = () => {
 };
 
 onMounted(() => {
-  setTimeout(checkScroll, 100);
+  nextTick(() => {
+    setTimeout(checkScroll, 500);
+  });
+
   // 添加页面滚动监听
   window.addEventListener('scroll', handlePageScroll);
 });

src/views/home/jdcomponents/JDUserPanel.vue

@@ -10,6 +10,7 @@
       </div>
       <div class="u-info">
         <p class="name">{{ userInfo.nickName }}</p>
+        <p class="links">{{ userInfo.customerName }}</p>
         <!-- <p @click="onPath('/breg')" class="links">切换企业账号<span class="divider">|</span>注册</p> -->
       </div>
     </div>
@@ -121,6 +122,7 @@ const chunkArray = (arr, size) => {
 getInfo().then((res) => {
   if (res.code == 200) {
     userInfo.value = res.data.user;
+    userInfo.value.customerName = res.data.customerName;
   }
 });
 

src/views/item/index.vue

@@ -113,6 +113,7 @@
       <div class="shop-right">
         <div class="shop-info">
           <div class="right-title">{{ dataInfo.itemName || '' }}</div>
+          <div class="right-title1">{{ dataInfo.promotionTitle || '' }}</div>
           <div class="right-price flex-row-between">
             <div class="flex-row-start">
               <div class="price1">
@@ -735,12 +736,17 @@ const handleMouseMove = (e: MouseEvent) => {
       .shop-info {
         padding: 20px 20px 30px 20px;
         .right-title {
-          min-height: 56px;
+          // min-height: 56px;
           font-weight: 600;
           font-size: 20px;
           color: #101828;
         }
 
+        .right-title1 {
+          font-size: 16px;
+          color: #999999;
+        }
+
         .right-num {
           font-size: 14px;
           color: #6a7282;

src/views/login.vue

@@ -293,6 +293,7 @@ onMounted(() => {
 
     .login-bos {
       height: 90%;
+      max-height: 420px;
       aspect-ratio: 1;
       // width: 420px;
       // height: 420px;
@@ -300,7 +301,7 @@ onMounted(() => {
       border-radius: 30px 30px 30px 30px;
       display: flex;
       flex-direction: column;
-      justify-content: center;
+      justify-content: space-around;
       align-items: center;
 
       :deep(.el-form-item) {

src/views/trad/index.vue

@@ -465,27 +465,24 @@ const disabledDate = (date: Date) => {
         }
       }
 
-      :deep(.el-select__wrapper) {
-        border: none;
-        /* 可选：去除聚焦时的高亮 */
-        box-shadow: none;
-        outline: none;
-        background: #f4f6f8;
-      }
-      :deep(.el-input__wrapper) {
-        border: none;
-        /* 可选：去除聚焦时的高亮 */
-        box-shadow: none;
-        outline: none;
-        background: #f4f6f8;
-      }
-      :deep(.el-textarea__inner) {
-        border: none;
-        /* 可选：去除聚焦时的高亮 */
-        box-shadow: none;
-        outline: none;
-        background: #f4f6f8;
-      }
+      // :deep(.el-select__wrapper) {
+      //   border: none;
+      //   box-shadow: none;
+      //   outline: none;
+      //   background: #f4f6f8;
+      // }
+      // :deep(.el-input__wrapper) {
+      //   border: none;
+      //   box-shadow: none;
+      //   outline: none;
+      //   background: #f4f6f8;
+      // }
+      // :deep(.el-textarea__inner) {
+      //   border: none;
+      //   box-shadow: none;
+      //   outline: none;
+      //   background: #f4f6f8;
+      // }
     }
     .cart-info {
       // width: 490px;