From e0f54802dca2bc55704eaee11132f5cefd8f4d53 Mon Sep 17 00:00:00 2001
From: zhaofang <752743406@qq.com>
Date: Sat, 22 Oct 2022 18:35:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/HomePage/homePage.vue | 55 ++++++++++++++++++----------
 src/components/UcHeader/Index.vue    | 26 +++++++------
 2 files changed, 50 insertions(+), 31 deletions(-)

diff --git a/src/components/HomePage/homePage.vue b/src/components/HomePage/homePage.vue
index b1a5fb15..b4d79098 100644
--- a/src/components/HomePage/homePage.vue
+++ b/src/components/HomePage/homePage.vue
@@ -12,20 +12,21 @@
 
            <div class="user-content">
               <div class="content-top">
-                <h6 content-bottom><router-link to="/home/index"> {{userData.name}}</router-link>
+                <h6 content-bottom> {{userData.name}}<span style="margin-left:8px;color: #999999;font-weight: 400;">{{userData.orgInfo}}</span>
+                  <router-link v-if="pageId == userInfo.aid" to="/user/Setting"><span class="content-one-info pointer">个人设置</span></router-link>
                  </h6>
-                 <div class="grade">
-                     <div>{{statData.level}}</div>
-                     <span style="color: #A3680A;margin-left:12px;line-height: 24px;">经验值：{{statData.evalue}}</span>
-                 </div>
-                 <el-button round plain class="btn-user" size="small" v-if="pageId != userInfo.aid && !isFollowHas" @click="toFollow()">关注TA</el-button>
-                 <el-button round plain class="btn-user" size="small" @click="cancelFollow()" v-if="isFollowHas">已关注</el-button>
-                 <el-button round plain class="btn-user" size="small"><router-link :to="'/home/'+pageId+'/leaving'">{{pageId == userInfo.aid ? '留言板':'去留言'}}</router-link></el-button>
               </div>
               <div class="content-bottom">
-                <p class="portal-summary-text">{{userData.sign}}</p>
+                <p class="portal-summary-text">{{userData.sign}} <router-link v-if="pageId == userInfo.aid"  to="/uc/study/courses" class="pointer" style="margin-left:50px;color:#0060FF;">个人中心>></router-link></p>
+              </div>
+              <div class="grade">
+                  <div>{{statData.level}}</div>
+                  <span style="color: #A3680A;margin-left:12px;line-height: 24px;">经验值：{{statData.evalue}}</span>
+                  <el-button round plain class="btn-user" style="margin-left:150px" size="small"><router-link :to="'/home/'+pageId+'/leaving'">{{pageId == userInfo.aid ? '留言板':'去留言'}}</router-link></el-button>
+                  <el-button round plain class="btn-user" size="small" v-if="pageId != userInfo.aid && !isFollowHas" @click="toFollow()">关注TA</el-button>
+                 <el-button round plain class="btn-user" size="small" @click="cancelFollow()" v-if="isFollowHas">已关注</el-button>
+                
               </div>
-
            </div>
         </div>
         <div class="learningData">
@@ -260,9 +261,17 @@
      }
      .grade{
        float: left;
-       margin-top: 10px;
+       margin-top: 20px;
+       .btn-user{
+            margin-top: -6px;
+            // margin-left: 68px;
+            height: 30px;
+            border-radius: 20px;
+            border: 1px solid #0060FF;
+            color: #0060FF;
+        }
        div{
-         margin-left: 22px;
+        //  margin-left: 22px;
          font-weight: 600;
           float: left;
           width: 57px;
@@ -293,20 +302,26 @@
     .user-content{
       flex: 1;
       .content-top{
-        margin-top: 15px;
+        // margin-top: 15px;
         height: 56px;
-        .btn-user{
-            margin-top: 6px;
-            height: 30px;
-            border-radius: 20px;
-            border: 1px solid #0060FF;
-            color: #0060FF;
-        }
+       
         h6{
           color: #333333;
           font-size: 26px;
           margin:0;
           float: left;
+          .content-one-info{
+            display: inline-block;
+            width: 97px;
+            height: 30px;
+            margin-left: 130px;
+            line-height: 30px;
+            text-align: center;
+            border-radius: 4px;
+            color: #588afc;
+            font-weight: normal;
+            border: 1px solid #387DF7;
+          }
         }
         span{
           color: #999999;
diff --git a/src/components/UcHeader/Index.vue b/src/components/UcHeader/Index.vue
index 97469f74..20db4c26 100644
--- a/src/components/UcHeader/Index.vue
+++ b/src/components/UcHeader/Index.vue
@@ -19,12 +19,14 @@
             <div class="content-top">
               <h6>{{userInfo.name}}</h6>
               <span>{{orgInfo}}</span>
-              <div class="grade">
-                 <div>{{statData.level}}</div>
-                 <span>经验值：{{statData.evalue}}</span>
-               </div>
+             
                <el-link @click="toPage('/user/Setting')" type="info" :underline="false"> <el-button class="editbutt">编辑资料</el-button></el-link>
             </div>
+            <div class="grade">
+                 <div>{{statData.level}}</div>
+                 <span>经验值：{{statData.evalue}}</span>
+                 <span style="margin-left:40px;color:#0060FF;"><router-link :to="'/home/'+userInfo.aid">个人主页>></router-link></span>
+               </div>
             <div class="content-bottom">
                <div class="medal-list">
                  <div class="medal-info" v-for="(m,midx) in medalList" :key="m.id" v-if="midx<3">
@@ -186,7 +188,7 @@ import {userAvatarText,cutFullName} from "@/utils/tools.js";
   }
 }
 .content-bottom{
-  margin-top: 30px;
+  margin-top: 10px;
   display: flex;
    .medal-list{
       //float: left;
@@ -233,17 +235,15 @@ import {userAvatarText,cutFullName} from "@/utils/tools.js";
   }
   .user-content{
     flex: 1;
-    .content-top{
-      margin-top: 15px;
-      line-height: 25px;
-      .grade{
-        display: inline-block;
+    .grade{
+      margin-top: 10px;
+        // display: inline-block;
         div{
             font-weight: 600;
             float: left;
             width: 58px;
             height: 24px;
-            text-align: center;
+            // text-align: center;
             line-height: 34px;
             color: #9D6110 ;
         }
@@ -254,6 +254,10 @@ import {userAvatarText,cutFullName} from "@/utils/tools.js";
 
         }
       }
+    .content-top{
+      // margin-top: 10px;
+      line-height: 25px;
+     
       h6{
         color: #333333;
         font-size: 26px;