From a2824f157f4ac6af83cc29303a54c77f9c22d0f9 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Fri, 20 Dec 2024 17:36:14 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E6=B8=85=E5=8D=95=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts                               |  1 +
 src/components/equipCardHall/index.vue        |  2 +-
 src/components/header/index.vue               |  2 +
 src/layout/header.vue                         | 57 ++++++++++++++-----
 src/views/AppMain.vue                         | 22 ++++---
 src/views/equip/detail.vue                    |  6 +-
 src/views/home/index.vue                      | 10 ++--
 .../orderManagement/components/order-home.vue |  2 +-
 .../components/order-home.vue                 |  2 +-
 9 files changed, 73 insertions(+), 31 deletions(-)

diff --git a/components.d.ts b/components.d.ts
index af20a38..8a1ab83 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -66,6 +66,7 @@ declare module 'vue' {
     TitleTip: typeof import('./src/components/TitleTip/index.vue')['default']
     UploadComponent: typeof import('./src/components/uploadComponent/index.vue')['default']
     UploadComponentNew: typeof import('./src/components/uploadComponentNew/index.vue')['default']
+    UploadComponentNewTwo: typeof import('./src/components/uploadComponentNewTwo/index.vue')['default']
     UploadImg: typeof import('./src/components/uploadImg.vue')['default']
   }
 }
diff --git a/src/components/equipCardHall/index.vue b/src/components/equipCardHall/index.vue
index 8c79ed4..16fa808 100644
--- a/src/components/equipCardHall/index.vue
+++ b/src/components/equipCardHall/index.vue
@@ -79,7 +79,7 @@ const onHandelLessee = () => {
     flex-direction: column;
 
     img {
-        height: 140px;
+        height: 240px;
     }
 
     .title {
diff --git a/src/components/header/index.vue b/src/components/header/index.vue
index 0decea3..5a2f50f 100644
--- a/src/components/header/index.vue
+++ b/src/components/header/index.vue
@@ -52,6 +52,8 @@ const handlerLogout = () => {
             router.push('/login')
             store.cleanUpToken('')
             store.clearUserInfo('')
+            localStorage.clear()
+            sessionStorage.clear()
             ElMessage({
                 type: 'success',
                 message: '已退出登录',
diff --git a/src/layout/header.vue b/src/layout/header.vue
index 2a55e07..6b75b74 100644
--- a/src/layout/header.vue
+++ b/src/layout/header.vue
@@ -62,6 +62,8 @@ const handlerLogout = () => {
             router.push('/login')
             store.cleanUpToken('')
             store.clearUserInfo('')
+            localStorage.clear()
+            sessionStorage.clear()
             ElMessage({
                 type: 'success',
                 message: '已退出登录',
@@ -104,6 +106,7 @@ const searchKeywordBtn = () => {
     keywordIptValue.value = keywordIptValue.value.replace(/\s*/g, '')
 
     store.addHistoryRecord(keywordIptValue.value)
+
     if (route.path == '/equipList') {
         if (searchTypeName.value === '装备') {
             $bus.emit('search', keywordIptValue.value)
@@ -115,7 +118,7 @@ const searchKeywordBtn = () => {
         }
     }
     if (route.path == '/parity') {
-        if (searchTypeName.value === '需求') {
+        if (searchTypeName.value == '需求') {
             $bus.emit('search', keywordIptValue.value)
         } else {
             router.push({
@@ -139,6 +142,35 @@ const searchKeywordBtn = () => {
             })
         }
     }
+    if (route.path == '/enterpriseZone') {
+        if (searchTypeName.value == '装备') {
+            router.push({
+                name: 'equipList',
+                query: { keyWord: keywordIptValue.value },
+            })
+        }
+        if (searchTypeName.value == '需求') {
+            router.push({
+                name: 'parity',
+                query: { keyWord: keywordIptValue.value },
+            })
+        }
+    }
+
+    if (route.path.includes('equipDetail')) {
+        if (searchTypeName.value == '装备') {
+            router.push({
+                name: 'equipList',
+                query: { keyWord: keywordIptValue.value },
+            })
+        }
+        if (searchTypeName.value == '需求') {
+            router.push({
+                name: 'parity',
+                query: { keyWord: keywordIptValue.value },
+            })
+        }
+    }
 }
 
 // 点击下方搜索记录时
@@ -224,7 +256,7 @@ const onJumpUser = () => {
     <!-- 头部个人信息  收藏夹  手机版等图标 -->
     <div class="header-container">
         <div class="header-user-info">
-            <div class="header-box wapper">
+            <div class="header-box">
                 <div class="header-item" v-if="isShowLogout">
                     <!-- <img src="../assets/img/home/star.png" alt="" /> -->
                     <a class="user-name"
@@ -303,10 +335,10 @@ const onJumpUser = () => {
         </div>
 
         <!-- 中间logo 部分 -->
-        <div class="logo-ipt-container wapper">
+        <div class="logo-ipt-container">
             <div class="home-logo">
                 <el-image
-                    style="width: 70%; margin-left: 60px; cursor: pointer"
+                    style="width: 70%; margin-left: 100px; cursor: pointer"
                     :src="imgSrc"
                     fit="cover"
                     @click="$router.push('/mall-view')"
@@ -422,13 +454,12 @@ const onJumpUser = () => {
 
 <style lang="scss" scoped>
 .header-container {
-    position: sticky;
-    top: 0;
-    left: 0;
-    z-index: 999;
-
     .header-user-info {
         background-color: #f5f5f5;
+        position: sticky;
+        top: 0;
+        left: 0;
+        z-index: 999;
     }
 
     /* 头部个人信息部分 */
@@ -554,14 +585,14 @@ const onJumpUser = () => {
         // padding: 30px 0 60px 0;
 
         .home-logo {
-            width: 246px;
+            width: 286px;
             height: 100%;
         }
 
         .home-search {
             position: relative;
-            width: 800px;
-            margin-left: 20px;
+            width: 1000px;
+            margin-left: 40px;
 
             .left-check-box {
                 position: absolute;
@@ -676,7 +707,7 @@ const onJumpUser = () => {
             width: 100%;
             display: flex;
             align-items: center;
-            justify-content: flex-end;
+            justify-content: center;
             cursor: pointer;
 
             span {
diff --git a/src/views/AppMain.vue b/src/views/AppMain.vue
index feeaf05..7b45b52 100644
--- a/src/views/AppMain.vue
+++ b/src/views/AppMain.vue
@@ -18,21 +18,27 @@ onMounted(() => {})
 </script>
 
 <template>
-    <HeaderCom />
-    <div class="container">
-        <el-config-provider :locale="locale">
-            <RouterView />
-        </el-config-provider>
+    <div class="app-container">
+        <HeaderCom />
+        <div class="container">
+            <el-config-provider :locale="locale">
+                <RouterView />
+            </el-config-provider>
+        </div>
+        <FooterInfo v-if="isMyInfoPage()" />
     </div>
-    <FooterInfo v-if="isMyInfoPage()" />
+
     <!-- <FooterInfo /> -->
 </template>
 
 <style scoped lang="scss">
+.app-container {
+    display: flex;
+    flex-direction: column;
+}
 .container {
-    width: 1200px;
+    width: 100%;
     margin: 0 auto;
-    overflow: hidden;
     background: #ffffff;
     border-radius: 30px;
     padding: 20px 30px;
diff --git a/src/views/equip/detail.vue b/src/views/equip/detail.vue
index d05eb08..f1702c9 100644
--- a/src/views/equip/detail.vue
+++ b/src/views/equip/detail.vue
@@ -1057,7 +1057,7 @@ const onAddCart = async () => {
         margin-bottom: 50px;
 
         .showImg {
-            width: 38%;
+            width: 40%;
             border-radius: 15px;
             // overflow: hidden;
             margin-right: 30px;
@@ -1128,6 +1128,7 @@ const onAddCart = async () => {
                 .left {
                     margin-right: 5px;
                     width: 62%;
+                    padding-left: 30px;
 
                     .title {
                         .name {
@@ -1147,7 +1148,7 @@ const onAddCart = async () => {
                             margin-top: 10px;
 
                             .item {
-                                font-size: 13px;
+                                font-size: 16px;
                                 font-family: PingFangSC, PingFang SC;
                                 font-weight: 400;
                                 color: #005af2;
@@ -1231,6 +1232,7 @@ const onAddCart = async () => {
                     flex: 1;
                     display: flex;
                     flex-direction: column;
+                    align-items: center;
                     // justify-content: space-between;
 
                     .collect {
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index b026d9f..51a4a22 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -270,7 +270,7 @@ const onSelectItem = (type: number) => {
             </div>
             <!-- 热搜装备 -->
 
-            <div class="hot-equip-container">
+            <div class="hot-equip-container" v-if="false">
                 <div class="hot-equip">
                     <span>最新装备</span>
                     <a
@@ -382,7 +382,7 @@ const onSelectItem = (type: number) => {
 }
 .home-index-banner {
     background-color: #fff;
-    padding: 20px 15px;
+    padding: 20px 5px;
     border-radius: 10px;
     box-sizing: border-box;
 }
@@ -396,7 +396,7 @@ const onSelectItem = (type: number) => {
         .left-nav {
             // padding: 10px 0;
             // margin-top: 8px;
-            width: 200px;
+            width: 270px;
             height: 100%;
             display: flex;
             flex-direction: column;
@@ -473,8 +473,8 @@ const onSelectItem = (type: number) => {
                     position: absolute;
                     display: none;
                     top: 0;
-                    left: 200px;
-                    width: 915px;
+                    left: 270px;
+                    width: 1200px;
                     min-height: 100%;
                     max-height: 100%;
                     background-color: #fff;
diff --git a/src/views/user/orderManagement/components/order-home.vue b/src/views/user/orderManagement/components/order-home.vue
index 58a06d5..3ef9239 100644
--- a/src/views/user/orderManagement/components/order-home.vue
+++ b/src/views/user/orderManagement/components/order-home.vue
@@ -667,7 +667,7 @@ const costSubmit = () => {
                                                     : ''
                                             "
                                         >
-                                            {{ goods.days }}{{ ' ' + '天' }}
+                                            {{ goods.originDays }}{{ ' ' + '天' }}
                                         </span>
                                         <span v-if="item.orderStatus == 20">
                                             {{
diff --git a/src/views/user/orderManagementCz/components/order-home.vue b/src/views/user/orderManagementCz/components/order-home.vue
index 9f9f027..1b83a9b 100644
--- a/src/views/user/orderManagementCz/components/order-home.vue
+++ b/src/views/user/orderManagementCz/components/order-home.vue
@@ -917,7 +917,7 @@ const wordUrl = ref('')
                                                     : ''
                                             "
                                         >
-                                            {{ goods.days }}{{ ' ' + '天' }}
+                                            {{ goods.originDays }}{{ ' ' + '天' }}
                                         </span>
                                         <span v-if="item.orderStatus == 20">
                                             {{