From 1b3712a1cc2e571518407b11da41b2d7d12577cd Mon Sep 17 00:00:00 2001
From: lmj <3407000732@qq.com>
Date: Tue, 1 Nov 2022 19:10:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/images/Recent.png             | Bin 0 -> 976 bytes
 src/components/HomePage/homePage.vue |  74 ++++++++++++++++-----------
 src/views/Index.vue                  |  17 ++++--
 3 files changed, 57 insertions(+), 34 deletions(-)
 create mode 100644 public/images/Recent.png

diff --git a/public/images/Recent.png b/public/images/Recent.png
new file mode 100644
index 0000000000000000000000000000000000000000..f2a7991298ff538965f1cd8e84c71d180647a6b9
GIT binary patch
literal 976
zcmV;>126oEP)<h;3K|Lk000e1NJLTq001li001lq1^@s69)wx}00001b5ch_0Itp)
z=>Px&ib+I4R9HvtnL%hARUF2@?@h9^JCBGIv|ukHco98#a|uE(6)K1)^`sXMVv#_l
zASGlS+LM<GN+A>xgr2-A2!ar#H4%DlPvSukiihTqH<{gJ-Y0K%H@2JDHQCuX3)#y)
zX5Reg_r87e=I!?pGxp((@uCE7UsH>ly^kfG74Q@(C(sedAUSc+hBCr9Ne)0ZJRbUc
zA34q|i@bMph_l@oZowk^VTs);MdA5WPdxD5bx1E%S$J5BU?IXG3|1TrRE}Z>!l^uN
zTsdeUV=0s}FE~afGrsualxhC@UCJ!fWc$<nOL=`X4cO{x(lOG~dfNJ$?N0uir01$D
zKD|m2`8r=&+1A6iFj4ffFKCS^tjI(j*1#tct-!<>Z~JW|lq|qRge8;!w9=r>ejiAU
zs)j(~_CDZ^tF1~`j<c!eT0pWj4_o+d5*4&XVXU~D7}FO)-k0ADLKt6)K*0h^B)q#f
zU^1IJ@TBUF&VUo(NfjNv{zT!b6`i`mZ+)xi&%3=h<<))hO#I`G54cn1AS#~{?Un6s
z1iaUW<h{8_7jC7kwW^@22kzwClA0rcH*K?d>8EAhpA@`u;L(D6n;vqL!t!fTyqc!;
zM+HAN;D5kz$C&8D+iBy@QJ{|<xIeY&L98|zFR!KCJPi2MfeBs&a7EC<0but{WG?-Z
z#y9^f^wfdF=4mn2Grq__7x4DMU|ef7c;V-j_})11V*wsQEOzp9g>W6v^ZUWLL*nB4
zmFD%wK_4q{06G7K;?2K$pMbi&fBECiToRwYb(s(T4Z2pqBzL1${B&)A$4v<UOB+|4
ztN;6y2oGK1^J@^^sr^GYbIaO+iq`qXF$zr1$g7$4-TdTRK=3CX`P6rN+3w_DNqT=~
zHt@kH>H6Lq0r;gejqhv!7irw)WzzGNznUin8h8B(@HmBn4X||=b{j}~Q8zfBiSe}F
z7Xvpm7=k{Lr!~PCgb%K%W#9P>Zs_C9z@gn5u}HjOSgsNd+{IwCf<9reQWb32;4b$2
zfU?lQdVR=-t=?|!<iA6DcAQdmIA0ptGZz^wex`-ObvLFN%9M#y2wzAC!HJIsG=Ry<
z<SGO)V%aXQF~;o+Wx`Lr7kfdk0yrHK9}H5SVfwR|1i?68CO;wNVJ6>Chzuj=BRNB#
y%@?uj0@;(N;3|*3>M%DC!%%6SahMw)weR1!P{$qC5r&Nb0000<MNUMnLSTZ1ht`<@

literal 0
HcmV?d00001

diff --git a/src/components/HomePage/homePage.vue b/src/components/HomePage/homePage.vue
index ea45c9d7..6b04c53a 100644
--- a/src/components/HomePage/homePage.vue
+++ b/src/components/HomePage/homePage.vue
@@ -11,30 +11,33 @@
             </div>
 
            <div class="user-content">
-              <div style="display: flex;justify-content: start;">
-                  <div  style="min-width: 260px;">
+              <div style="display: flex;justify-content: start;margin-left:25px">
+                  <div  style="min-width: 240px;">
                     <div class="content-top">
-                      <h6 content-bottom> {{userData.name}}<span style="margin-left:8px;color: #999999;font-weight: 400;">{{orgInfo}}</span> </h6>
+                      <h6> {{userData.name}}<span style="margin-left:8px;color: #999999;font-weight: 400;">{{orgInfo}}</span> </h6>
                     </div>
-                    <div class="content-bottom">
+                     <div class="grade" style="margin-top:5px">
+                        <div class="level">{{statData.level}}</div>
+                        <span style="color: #A3680A;margin-left:5px;line-height: 24px;margin-right: 10px;">经验值：{{statData.evalue}}</span>
+                      <div style="float:right">
+                      <el-button type="text" round class="btn-user"  v-if="pageId != userInfo.aid && !isFollowHas" @click="toFollow()">关注TA</el-button>
+                      <el-button type="text" round  class="btn-user"  @click="cancelFollow()" v-if="isFollowHas">已关注</el-button>
+                      <el-button type="text" round  class="btn-user"  >  <router-link :to="'/home/'+pageId+'/leaving'">{{pageId == userInfo.aid ? '留言板':'去留言'}}<i class="el-icon-arrow-right"></i> </router-link> </el-button>
+                      </div>
+                    </div>
+                    <div class="content-bottom" style="margin-top:20px">
                       <p v-if="userData.sign" class="portal-summary-text">{{userData.sign}} </p>
                       <p v-else  class="portal-summary-text">暂无签名</p>
                     </div>
-                    <div class="grade">
-                        <div>{{statData.level}}</div>
-                        <span style="color: #A3680A;margin-left:5px;line-height: 24px;margin-right: 10px;">经验值：{{statData.evalue}}</span>
-
-                    </div>
+                   
                   </div>
                   <div style="text-align: center;">
                       <div style="height: 30px;margin-top: 10px;">
                         <router-link v-if="pageId == userInfo.aid" to="/user/Setting"><span class="content-one-info pointer">个人设置</span></router-link>
+                      <span style="margin-left:10px" class="content-one-info" ><router-link v-if="pageId == userInfo.aid"  to="/uc/study/courses" class="pointer" style="color:#0060FF;">个人中心</router-link></span>
+
                       </div>
-                      <div  style="height: 30px;margin-top: 16px;font-size: 14px;"><router-link v-if="pageId == userInfo.aid"  to="/uc/study/courses" class="pointer" style="color:#0060FF;">个人中心>></router-link></div>
-                      <div style="height: 30px;margin-top: 8px;">
-                      <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>
                </div>
            </div>
@@ -190,6 +193,16 @@
   </script>
 
 <style lang="scss" scoped>
+  .level{
+    float: left;
+    width: 57px;
+    height: 24px;
+    text-align: center;
+    line-height: 28px;
+    background-image: url(../../../public/images/lvbg.png);
+    background-repeat: no-repeat;
+    background-size:100%;
+  }
   .ranking-link{
     font-size: 16px;
     font-weight: 600;
@@ -270,16 +283,13 @@
        margin-top: 10px;
      }
      .btn-user{
-          margin-top: -6px;
-          // margin-left: 68px;
-          height: 30px;
-          border-radius: 20px;
-          border: 1px solid #0060FF;
-          color: #0060FF;
+          color: #387DF7;
+          margin: 0;
+          font-size: 16px;
+          padding: 0;
       }
      .grade{
-       float: left;
-       margin-top: 20px;
+       // margin-top: 20px;
 
        div{
         //  margin-left: 22px;
@@ -314,7 +324,8 @@
       flex: 1;
       .content-top{
         // margin-top: 15px;
-        height: 56px;
+        height: 46px;
+        line-height: 46px;
 
         h6{
           color: #333333;
@@ -335,14 +346,16 @@
   }
 .content-one-info{
   display: inline-block;
-  width: 97px;
-  height: 30px;
   line-height: 30px;
-  text-align: center;
-  border-radius: 4px;
-  color: #588afc;
-  font-weight: normal;
-  border: 1px solid #387DF7;
+   width: 80px;
+    height: 30px;
+    text-align: center;
+    border-radius: 20px;
+    padding: 0;
+    border: 1px solid #619DFF;
+    font-size: 14px;
+    color: #387DF7;
+  
 }
 .editbutt{
   font-size: 14px;
@@ -437,6 +450,7 @@
     }
   }
   .content-bottom{
+    
      .medalbutt{
        margin-right: 20px;
      }
diff --git a/src/views/Index.vue b/src/views/Index.vue
index ffb055ad..e46692d9 100644
--- a/src/views/Index.vue
+++ b/src/views/Index.vue
@@ -52,8 +52,11 @@
           </div>
         </a>
         <div class="last-study-info">
-          <div class="one-line-ellipsis" style="color: #000000;">
-            <router-link :to="'/course/studyindex?id='+lastStudy.courseId" >最近学习： {{lastStudy.courseName}} </router-link>
+          <div class="one-line-ellipsis" style="color: #387DF7;font-size: 16px;">
+            <router-link :to="'/course/studyindex?id='+lastStudy.courseId" > 
+            <img class="Recent" :src="`${webBaseUrl}/images/Recent.png`" alt="">
+            最近学习： {{lastStudy.courseName}}
+             </router-link>
           </div>
           <!-- <div class="tobe-icon">
             <img :src="`${webBaseUrl}/images/homeWu/Pending.png`" alt="">
@@ -1091,6 +1094,11 @@
 </script>
 
 <style scoped lang="scss">
+.Recent{
+  vertical-align: top;
+  width: 22px;
+  height: 22px;
+}
 .jinian-medal-img{
   text-align: center;
   padding-top: 10px;
@@ -1224,7 +1232,7 @@
     right: 8%;
     top: 105px;
     // background: url('/images/homeWu/personal-bgimg.png');
-    background: rgba($color: #fff, $alpha: 0.2);
+    background: rgba($color: #fff, $alpha: 0.85);
     border-radius: 8px;
     z-index: 999;
     backdrop-filter: blur(10px);
@@ -1292,7 +1300,7 @@
         text-align: center;
       }
       .label {
-        color: #333;
+        color: #999999;
         font-size: 12px;
         text-align: center;
       }
@@ -1305,6 +1313,7 @@
           font-size: 22px;
           text-align: center;
           color: #333;
+          font-weight: 500;
         }
       }
     }