From 925cb91925b56a612688463fda89542ddbedc3c0 Mon Sep 17 00:00:00 2001
From: pixel <303176530@qq.com>
Date: Tue, 15 Oct 2019 22:56:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=A4=B4=E5=83=8F=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=EF=BC=88=E6=98=8E=E5=A4=A9=E6=B7=BB=E5=8A=A0=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E4=BF=A1=E6=81=AF=E6=9B=B4=E6=96=B0=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 QMPlusServer/controller/api/user.go           |  6 +-
 QMPlusServer/model/dbModel/user.go            |  4 +-
 QMPlusVuePage/src/view/dashbord/index.vue     | 22 +------
 QMPlusVuePage/src/view/layout/aside/index.vue | 36 +++++------
 QMPlusVuePage/src/view/layout/index.vue       |  4 ++
 QMPlusVuePage/src/view/person/person.vue      | 63 +++++++++++++++++++
 6 files changed, 91 insertions(+), 44 deletions(-)
 create mode 100644 QMPlusVuePage/src/view/person/person.vue

diff --git a/QMPlusServer/controller/api/user.go b/QMPlusServer/controller/api/user.go
index 4eb9e666..400183ab 100644
--- a/QMPlusServer/controller/api/user.go
+++ b/QMPlusServer/controller/api/user.go
@@ -129,10 +129,9 @@ func UploadHeaderImg(c *gin.Context) {
 	//获取头像文件
 	// 这里我们通过断言获取 claims内的所有内容
 	waitUse := claims.(*middleware.CustomClaims)
-	fmt.Println(waitUse.NickName)
+	uuid := waitUse.UUID
 	_, header, err := c.Request.FormFile("headerImg")
 	//便于找到用户 以后从jwt中取
-	username := c.PostForm("username")
 	if err != nil {
 		servers.ReportFormat(c, false, fmt.Sprintf("上传文件失败，%v", err), gin.H{})
 	} else {
@@ -142,8 +141,7 @@ func UploadHeaderImg(c *gin.Context) {
 			servers.ReportFormat(c, false, fmt.Sprintf("接收返回值失败，%v", err), gin.H{})
 		} else {
 			//修改数据库后得到修改后的user并且返回供前端使用
-			err, user := new(dbModel.User).UploadHeaderImg(username, filePath)
-
+			err, user := new(dbModel.User).UploadHeaderImg(uuid, filePath)
 			if err != nil {
 				servers.ReportFormat(c, false, fmt.Sprintf("修改数据库链接失败，%v", err), gin.H{})
 			} else {
diff --git a/QMPlusServer/model/dbModel/user.go b/QMPlusServer/model/dbModel/user.go
index 675246b5..8c870c42 100644
--- a/QMPlusServer/model/dbModel/user.go
+++ b/QMPlusServer/model/dbModel/user.go
@@ -69,9 +69,9 @@ func (u *User) Login() (err error, userInter *User) {
 }
 
 // 用户头像上传更新地址
-func (u *User) UploadHeaderImg(username string, filePath string) (err error, userInter *User) {
+func (u *User) UploadHeaderImg(uuid uuid.UUID, filePath string) (err error, userInter *User) {
 	var user User
-	err = qmsql.DEFAULTDB.Where("username = ?", username).First(&user).Update("header_img", filePath).First(&user).Error
+	err = qmsql.DEFAULTDB.Where("uuid = ?", uuid).First(&user).Update("header_img", filePath).First(&user).Error
 	return err, &user
 }
 
diff --git a/QMPlusVuePage/src/view/dashbord/index.vue b/QMPlusVuePage/src/view/dashbord/index.vue
index f80c6134..dddefe9e 100644
--- a/QMPlusVuePage/src/view/dashbord/index.vue
+++ b/QMPlusVuePage/src/view/dashbord/index.vue
@@ -6,21 +6,7 @@
     <h4 style="text-align:center">
       微信：shouzi_1994
     </h4>
-    <!-- <el-card class="box-card" shadow="hover">
-      <div class="clearfix" slot="header">
-        <span>用户信息</span>
-      </div>
-      <el-row>
-        <div class="fl-left left-mg-xs">
-          <el-avatar :size="120" :src="userInfo.headerImg" shape="square"></el-avatar>
-        </div>
-        <div class="fl-left left-mg-lg">
-          <div>用户ID：{{userInfo.uuid}}</div>
-          <div>用户昵称：{{userInfo.nickName}}</div>
-          <div>用户组：{{userInfo.authority&&userInfo.authority.authorityName}}</div>
-        </div>
-      </el-row>
-    </el-card> -->
+    
     <Animition />
   </div>
 </template>
@@ -39,8 +25,6 @@ export default {
 }
 </script>
 
-<style scoped>
-.box-card {
-  width: 600px;
-}
+<style lang="scss" scoped>
+
 </style>
\ No newline at end of file
diff --git a/QMPlusVuePage/src/view/layout/aside/index.vue b/QMPlusVuePage/src/view/layout/aside/index.vue
index b91768d0..c9a8e2e9 100644
--- a/QMPlusVuePage/src/view/layout/aside/index.vue
+++ b/QMPlusVuePage/src/view/layout/aside/index.vue
@@ -1,26 +1,24 @@
 <template>
   <div>
-    <div class="menu-total"  @click="isCollapse=!isCollapse">
+    <div @click="isCollapse=!isCollapse" class="menu-total">
       <i class="el-icon-arrow-right" v-if="isCollapse"></i>
       <i class="el-icon-arrow-left" v-else></i>
     </div>
-      <el-scrollbar style="height:calc(100vh - 52px)">
-    <transition name="el-zoom-in-top">
-      <el-menu
-        :class="['el-menu-vertical',!isCollapse&&'noCollapse']"
-        :collapse="isCollapse"
-        :default-active="active"
-        @select="selectMenuItem"
-        unique-opened
-      >
-        <aside-component
-          :key="item.name"
-          :routerInfo="item"
-          v-for="item in asyncRouters[0].children"
-        />
-      </el-menu>
-    </transition>
-      </el-scrollbar>
+    <el-scrollbar style="height:calc(100vh - 52px)">
+      <transition name="el-zoom-in-top">
+        <el-menu
+          :class="['el-menu-vertical',!isCollapse&&'noCollapse']"
+          :collapse="isCollapse"
+          :default-active="active"
+          @select="selectMenuItem"
+          unique-opened
+        >
+          <template v-for="item in asyncRouters[0].children">
+            <aside-component :key="item.name" :routerInfo="item" v-if="!item.hidden" />
+          </template>
+        </el-menu>
+      </transition>
+    </el-scrollbar>
   </div>
 </template>
 
@@ -32,7 +30,7 @@ export default {
   data() {
     return {
       active: '',
-      isCollapse: false,
+      isCollapse: false
     }
   },
   methods: {
diff --git a/QMPlusVuePage/src/view/layout/index.vue b/QMPlusVuePage/src/view/layout/index.vue
index cc5bce8c..2f5d472e 100644
--- a/QMPlusVuePage/src/view/layout/index.vue
+++ b/QMPlusVuePage/src/view/layout/index.vue
@@ -15,6 +15,7 @@
                 <el-badge is-dot />
               </span>
             </el-dropdown-item>
+            <el-dropdown-item @click.native="toPerson" icon="el-icon-s-custom">个人信息</el-dropdown-item>            
             <el-dropdown-item @click.native="LoginOut" icon="el-icon-table-lamp"> 登 出 </el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
@@ -54,6 +55,9 @@ export default {
     ...mapMutations('user', ['LoginOut']),
     totalCollapse() {
       this.$bus.emit('totalCollapse')
+    },
+    toPerson(){
+      this.$router.push({name:"person"})
     }
   },
   computed: {
diff --git a/QMPlusVuePage/src/view/person/person.vue b/QMPlusVuePage/src/view/person/person.vue
new file mode 100644
index 00000000..4289f0b5
--- /dev/null
+++ b/QMPlusVuePage/src/view/person/person.vue
@@ -0,0 +1,63 @@
+<template>
+  <div>
+    <div class="fl-left left-mg-xs">
+      <el-upload
+        :headers="{'x-token':token}"
+        :on-success="handleAvatarSuccess"
+        :show-file-list="false"
+        action="api/user/uploadHeaderImg"
+        class="avatar-uploader"
+        name="headerImg"
+      >
+        <img :src="userInfo.headerImg" class="avatar" v-if="userInfo.headerImg" />
+        <i class="el-icon-plus avatar-uploader-icon" v-else></i>
+      </el-upload>
+
+      <!-- <el-avatar :size="120" :src="userInfo.headerImg" shape="square"></el-avatar> -->
+    </div>
+    <div class="fl-left left-mg-lg">
+      <div>用户ID：{{userInfo.uuid}}</div>
+      <div>用户昵称：{{userInfo.nickName}}</div>
+      <div>用户组：{{userInfo.authority&&userInfo.authority.authorityName}}</div>
+    </div>
+  </div>
+</template>
+<script>
+import { mapGetters } from 'vuex'
+export default {
+  name: 'Person',
+  computed: {
+    ...mapGetters('user', ['userInfo', 'token'])
+  },
+  methods:{
+      handleAvatarSuccess(){
+        //   上传完成后更新用户头像 今晚太困了 明天更新 今晚暂时调通更新功能
+      }
+  }
+}
+</script>
+<style lang="scss">
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+.avatar-uploader .el-upload:hover {
+  border-color: #409eff;
+}
+.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  line-height: 178px;
+  text-align: center;
+}
+.avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
\ No newline at end of file
-- 
GitLab