From 1ef6cc508ac6652b8c0493916852a588cc13b55b Mon Sep 17 00:00:00 2001
From: xuhuajiao <13476289682@163.com>
Date: Wed, 25 May 2022 14:56:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83/=E5=A4=B4?=
 =?UTF-8?q?=E5=83=8F=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                        |  6 ++++++
 src/assets/styles/index.scss     |  1 +
 src/assets/styles/yxk-admin.scss |  8 ++++++++
 src/layout/components/Navbar.vue | 35 ++++++++++++++++++--------------
 src/views/system/user/center.vue | 10 ++++++++-
 5 files changed, 44 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index ee6437d..341c403 100644
--- a/README.md
+++ b/README.md
@@ -31,6 +31,7 @@
 │   ├── utils                  # 全局公用方法
 │   ├── views                  # views 所有页面
 │   │   ├── archivesConfig        # 档案配置
+│   │   ├── category              # 门类管理
 │   │   ├── components            # views内页面组件
 │   │   ├── dashboard             # 首页面板内容
 │   │   ├── features              # 错误页面
@@ -70,4 +71,9 @@ npm run build:stage
 
 # 构建生产环境
 npm run build:prod
+
+#打包注意
+router.js - mode改为'hash'
+vue.config.js - publicPath: './'
+.env.production - 地址改为真实的生产服务器地址
 ```
\ No newline at end of file
diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index 3000a5c..45e4919 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -129,6 +129,7 @@ ul{
   }
 }
 
+
 //main-container全局样式
 .app-wrapper{
   background-color: $menuBg;
diff --git a/src/assets/styles/yxk-admin.scss b/src/assets/styles/yxk-admin.scss
index 46f24bb..3c3b394 100644
--- a/src/assets/styles/yxk-admin.scss
+++ b/src/assets/styles/yxk-admin.scss
@@ -726,4 +726,12 @@
       background-size: contain;
     }
   }
+}
+
+// 默认底图 - 暂时只有头像
+.user-img-cover{
+  border-radius: 50%;
+  background: url(~@/assets/images/avatar.png) no-repeat #fff;
+  background-size: cover;
+  overflow: hidden;
 }
\ No newline at end of file
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 2235b35..1549064 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -6,7 +6,7 @@
     <logo v-if="showLogo" :collapse="isCollapse" />
 
     <div class="right-menu">
-      <template v-if="device!=='mobile'">
+      <!-- <template v-if="device!=='mobile'">
         <search id="header-search" class="right-menu-item" />
 
         <el-tooltip content="项目文档" effect="dark" placement="bottom">
@@ -20,20 +20,21 @@
         <el-tooltip content="布局设置" effect="dark" placement="bottom">
           <size-select id="size-select" class="right-menu-item hover-effect" />
         </el-tooltip>
-
-      </template>
+      </template> -->
 
       <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
         <div class="avatar-wrapper">
-          <img :src="user.avatarName ? baseApi + '/avatar/' + user.avatarName : Avatar" class="user-avatar">
+          <div class="user-img-cover">
+            <img :src="user.avatarName ? baseApi + '/avatar/' + user.avatarName : Avatar" class="user-avatar" :onerror="defaultImg">
+          </div>
           <i class="el-icon-caret-bottom" />
         </div>
         <el-dropdown-menu slot="dropdown">
-          <span style="display:block;" @click="show = true">
+          <!-- <span style="display:block;" @click="show = true">
             <el-dropdown-item>
               布局设置
             </el-dropdown-item>
-          </span>
+          </span> -->
           <router-link to="/user/center">
             <el-dropdown-item>
               个人中心
@@ -55,25 +56,26 @@ import { mapGetters } from 'vuex'
 import Logo from '@/layout/components/Sidebar/Logo'
 // import Breadcrumb from '@/components/Breadcrumb'
 // import Hamburger from '@/components/Hamburger'
-import Doc from '@/components/Doc'
-import Screenfull from '@/components/Screenfull'
-import SizeSelect from '@/components/SizeSelect'
-import Search from '@/components/HeaderSearch'
+// import Doc from '@/components/Doc'
+// import Screenfull from '@/components/Screenfull'
+// import SizeSelect from '@/components/SizeSelect'
+// import Search from '@/components/HeaderSearch'
 import Avatar from '@/assets/images/avatar.png'
 
 export default {
   components: {
     // Breadcrumb,
     // Hamburger,
-    Screenfull,
-    SizeSelect,
-    Search,
-    Doc,
+    // Screenfull,
+    // SizeSelect,
+    // Search,
+    // Doc,
     Logo
   },
   data() {
     return {
       Avatar: Avatar,
+      defaultImg: 'this.src="' + require('@/assets/images/avatar.png') + '"',
       dialogVisible: false
     }
   },
@@ -187,7 +189,10 @@ export default {
       .avatar-wrapper {
         margin-top: 5px;
         position: relative;
-
+        .user-img-cover{
+          width: 40px;
+          height: 40px;
+        }
         .user-avatar {
           cursor: pointer;
           width: 40px;
diff --git a/src/views/system/user/center.vue b/src/views/system/user/center.vue
index e2791be..201b6f9 100644
--- a/src/views/system/user/center.vue
+++ b/src/views/system/user/center.vue
@@ -7,7 +7,9 @@
         <div class="user-content">
           <h4 class="info-title">个人信息</h4>
           <div class="el-upload">
-            <img :src="user.avatarName ? baseApi + '/avatar/' + user.avatarName : Avatar" title="点击上传头像" class="avatar" @click="toggleShow">
+            <div class="user-img-cover">
+              <img :src="user.avatarName ? baseApi + '/avatar/' + user.avatarName : Avatar" title="点击上传头像" class="avatar" :onerror="defaultImg" @click="toggleShow">
+            </div>
             <myUpload
               v-model="show"
               :headers="headers"
@@ -130,6 +132,7 @@ export default {
       }
     }
     return {
+      defaultImg: 'this.src="' + require('@/assets/images/avatar.png') + '"',
       show: false,
       Avatar: Avatar,
       activeIndex: 0,
@@ -222,6 +225,11 @@ export default {
     border-radius: 50%;
     margin: 40px auto 60px auto;
     overflow: hidden;
+    .user-img-cover{
+      width: 120px;
+      height: 120px;
+      line-height: 120px;
+    }
     .avatar {
       width: 100%;
       height: 100%;