From 637cacad48370b6378337ff58a7880b145ff5b40 Mon Sep 17 00:00:00 2001
From: myTest383 <address>
Date: Wed, 27 Nov 2024 08:53:56 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E5=AE=9A=E5=95=86=E5=9F=8E=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                  |   4 +-
 src/layout/components/Navbar.vue | 305 ++++++++++++++++---------------
 src/settings.js                  |  24 +--
 3 files changed, 167 insertions(+), 166 deletions(-)

diff --git a/.env.production b/.env.production
index 0e5f539..3714a9c 100644
--- a/.env.production
+++ b/.env.production
@@ -5,5 +5,5 @@ ENV = 'production'
 VUE_APP_BASE_API = '/lpkapi'
 
 ## 配置 正式接口地址
-VUE_APP_URL = ""
-VUE_APP_REPORT_URL = ""
+VUE_APP_URL = "https://ordermall.yxtsoft.com"
+VUE_APP_REPORT_URL = "https://ordermall.yxtsoft.com"
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index b5e6257..5901a5c 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -1,168 +1,169 @@
 <template>
-  <div>
-    <div class="navbar">
-     <p class="breadcrumb-container"><img src="@/assets/loginImg/logo.png" style="width: 45px;height: 45px;margin-right: 10px;"/>惠享管理平台</p>
-     <!-- <h3 class="breadcrumb-container">银行供应链贷后监管平台</h3> -->
-      <div class="right-menu">
-<!--        <p>{{Orgname}} {{departmentName}} 欢迎, {{name}}</p>-->
-       <!-- <p>欢迎您，{{name}}</p>
+    <div>
+        <div class="navbar">
+            <p class="breadcrumb-container"><img src="@/assets/loginImg/logo.png"
+                    style="width: 45px;height: 45px;margin-right: 10px;" />预定商城管理平台</p>
+            <!-- <h3 class="breadcrumb-container">银行供应链贷后监管平台</h3> -->
+            <div class="right-menu">
+                <!--        <p>{{Orgname}} {{departmentName}} 欢迎, {{name}}</p>-->
+                <!-- <p>欢迎您，{{name}}</p>
         <p class="dy" @click="logout()"><img src="@/assets/images/dy.png"></p> -->
-      </div>
+            </div>
+        </div>
+        <el-footer class="footer" height="40px">Copyright © {{ year }} 预定商城管理平台 All Rights Reserved</el-footer>
     </div>
-    <el-footer class="footer" height="40px">Copyright © {{ year }} 惠享管理平台 All Rights Reserved</el-footer>
-  </div>
 </template>
 
 <script>
-  export default {
-    data() {
-      return {
-        name: '',
-        year:'',
-      }
-    },
-    mounted() {
-      this.name = window.sessionStorage.getItem('userName')
-      var nowDate = new Date()
-      this.year = nowDate.getFullYear()
-    },
-    methods: {
-      logout() {
-        this.$confirm('确定要退出吗, 是否继续?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-            // this.$store.commit('user/SET_UESRINFO', '')
-            this.$router.push({
-              path: '/login'
-            })
-          })
-      },
+    export default {
+        data() {
+            return {
+                name: '',
+                year: '',
+            }
+        },
+        mounted() {
+            this.name = window.sessionStorage.getItem('userName')
+            var nowDate = new Date()
+            this.year = nowDate.getFullYear()
+        },
+        methods: {
+            logout() {
+                this.$confirm('确定要退出吗, 是否继续?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(() => {
+                    // this.$store.commit('user/SET_UESRINFO', '')
+                    this.$router.push({
+                        path: '/login'
+                    })
+                })
+            },
+        }
     }
-  }
 </script>
 
 <style lang="scss" scoped>
-  @import "~@/styles/variables.scss";
-
-  .navbar {
-    height: 60px;
-    overflow: hidden;
-    position: relative;
-    background: $header-bg;
-    padding: 0 30px;
-    box-shadow: 0 1px 4px rgba(0, 21, 41, .08);
-
-    .hamburger-container {
-      line-height: 46px;
-      height: 100%;
-      float: left;
-      cursor: pointer;
-      transition: background .3s;
-      -webkit-tap-highlight-color: transparent;
-
-      &:hover {
-        background: rgba(0, 0, 0, .025)
-      }
-    }
+    @import "~@/styles/variables.scss";
+
+    .navbar {
+        height: 60px;
+        overflow: hidden;
+        position: relative;
+        background: $header-bg;
+        padding: 0 30px;
+        box-shadow: 0 1px 4px rgba(0, 21, 41, .08);
+
+        .hamburger-container {
+            line-height: 46px;
+            height: 100%;
+            float: left;
+            cursor: pointer;
+            transition: background .3s;
+            -webkit-tap-highlight-color: transparent;
 
-   .breadcrumb-container {
-     display: flex;
-     align-items: center;
-     color: #fff;
-     font-size: 26px;
-     line-height: 60px;
-     margin: 0;
-     float: left;
-   }
-
-    .right-menu {
-      float: right;
-      height: 100%;
-      line-height: 60px;
-      color: #fff;
-
-      &:focus {
-        outline: none;
-      }
-
-      p {
-        display: inline-block;
-        margin: 0;
-        padding: 0;
-        padding: 0 15px;
-      }
-
-      img {
-        vertical-align: middle;
-        margin: 0 10px;
-        cursor: pointer;
-      }
-
-      .backToHome {
-        display: inline-block;
-        vertical-align: middle;
-        padding: 0 15px;
-        cursor: pointer;
-      }
-
-      .backToHome:hover {
-        background: #087dba;
-      }
-
-      .right-menu-item {
-        display: inline-block;
-        padding: 0 8px;
-        height: 100%;
-        font-size: 18px;
-        color: #5a5e66;
-        vertical-align: text-bottom;
-
-        &.hover-effect {
-          cursor: pointer;
-          transition: background .3s;
-
-          &:hover {
-            background: rgba(0, 0, 0, .025)
-          }
+            &:hover {
+                background: rgba(0, 0, 0, .025)
+            }
         }
-      }
-
-      .avatar-container {
-        margin-right: 30px;
-
-        .avatar-wrapper {
-          margin-top: 5px;
-          position: relative;
 
-          .user-avatar {
-            cursor: pointer;
-            width: 40px;
-            height: 40px;
-            border-radius: 10px;
-          }
+        .breadcrumb-container {
+            display: flex;
+            align-items: center;
+            color: #fff;
+            font-size: 26px;
+            line-height: 60px;
+            margin: 0;
+            float: left;
+        }
 
-          .el-icon-caret-bottom {
-            cursor: pointer;
-            position: absolute;
-            right: -20px;
-            top: 25px;
-            font-size: 12px;
-          }
+        .right-menu {
+            float: right;
+            height: 100%;
+            line-height: 60px;
+            color: #fff;
+
+            &:focus {
+                outline: none;
+            }
+
+            p {
+                display: inline-block;
+                margin: 0;
+                padding: 0;
+                padding: 0 15px;
+            }
+
+            img {
+                vertical-align: middle;
+                margin: 0 10px;
+                cursor: pointer;
+            }
+
+            .backToHome {
+                display: inline-block;
+                vertical-align: middle;
+                padding: 0 15px;
+                cursor: pointer;
+            }
+
+            .backToHome:hover {
+                background: #087dba;
+            }
+
+            .right-menu-item {
+                display: inline-block;
+                padding: 0 8px;
+                height: 100%;
+                font-size: 18px;
+                color: #5a5e66;
+                vertical-align: text-bottom;
+
+                &.hover-effect {
+                    cursor: pointer;
+                    transition: background .3s;
+
+                    &:hover {
+                        background: rgba(0, 0, 0, .025)
+                    }
+                }
+            }
+
+            .avatar-container {
+                margin-right: 30px;
+
+                .avatar-wrapper {
+                    margin-top: 5px;
+                    position: relative;
+
+                    .user-avatar {
+                        cursor: pointer;
+                        width: 40px;
+                        height: 40px;
+                        border-radius: 10px;
+                    }
+
+                    .el-icon-caret-bottom {
+                        cursor: pointer;
+                        position: absolute;
+                        right: -20px;
+                        top: 25px;
+                        font-size: 12px;
+                    }
+                }
+            }
         }
-      }
     }
-  }
-
-  .footer {
-    position: fixed;
-    bottom: 0;
-    width: 100%;
-    line-height: 40px;
-    background: #E9F1F7;
-    text-align: center;
-    font-size: 14px;
-    color: #666;
-  }
-</style>
+
+    .footer {
+        position: fixed;
+        bottom: 0;
+        width: 100%;
+        line-height: 40px;
+        background: #E9F1F7;
+        text-align: center;
+        font-size: 14px;
+        color: #666;
+    }
+</style>
\ No newline at end of file
diff --git a/src/settings.js b/src/settings.js
index 03a773e..0446137 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -1,16 +1,16 @@
 module.exports = {
 
-  title: '惠享',
+    title: '预定商城系统',
 
-  /**
-   * @type {boolean} true | false
-   * @description Whether fix the header
-   */
-  fixedHeader: false,
+    /**
+     * @type {boolean} true | false
+     * @description Whether fix the header
+     */
+    fixedHeader: false,
 
-  /**
-   * @type {boolean} true | false
-   * @description Whether show the logo in sidebar
-   */
-  sidebarLogo: false
-}
+    /**
+     * @type {boolean} true | false
+     * @description Whether show the logo in sidebar
+     */
+    sidebarLogo: false
+}
\ No newline at end of file