From 26ca3517e12dcbcefa5435a3d50f6fcd0070f5f8 Mon Sep 17 00:00:00 2001
From: weinan2087 <weinan2087@163.com>
Date: Wed, 2 Nov 2022 15:33:51 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=92=AD=E6=94=BE=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/user/Noteedit.vue | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/views/user/Noteedit.vue b/src/views/user/Noteedit.vue
index c8eb63a1..0e26f339 100644
--- a/src/views/user/Noteedit.vue
+++ b/src/views/user/Noteedit.vue
@@ -7,8 +7,12 @@
             <span class="his-info pointer" @click="isShowList = true">历史记录</span>
          </div>
          <div :class="editContent">
-            <div class="note-tit">
-                <div @click="toCoursePage()" v-if="editdata.playTime != ''" :style="{cursor:editdata.type==1? 'pointer':''}"><img :src="`${webBaseUrl}/images/coteplay.png`" alt="">{{getHMS(editdata.playTime)}}</div>
+            <div  v-if="editdata.playTime != '' " class="note-tit">
+                <div :style="{cursor:editdata.type==1? 'pointer':''}">
+					<img :src="`${webBaseUrl}/images/coteplay.png`" @click="toCoursePage()" alt="">
+					<span @click="toCoursePage()">{{getHMS(editdata.playTime)}}</span>
+					<img :src="`${webBaseUrl}/images/cotedetel.png`" style="margin-top:4px;margin-left:5px;" @click="timeDel()" />
+				</div>
             </div>
             <div class="note-text" v-if="editdata.contentType != 3">
                <!-- <input style="vertical-align:top;outline:none;" type="textarea"  :rows="4" v-model="editdata.content"> -->
@@ -106,6 +110,9 @@ export default {
       imgDel(index) {
          this.imgContent.splice(index,1);
       },
+	  timeDel() {
+	      this.editdata.playTime = '';
+	  },
        comeback(){
           clearInterval(this.timer);
           this.timer = null;

From 3dd8438e3dc4484525484078eafc210284211da5 Mon Sep 17 00:00:00 2001
From: weinan2087 <weinan2087@163.com>
Date: Wed, 2 Nov 2022 16:06:48 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=96=87=E5=AD=97=E5=AF=B9=E9=BD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ucurrency/Index.vue | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/views/ucurrency/Index.vue b/src/views/ucurrency/Index.vue
index 95f4d2e6..3bbdb24f 100644
--- a/src/views/ucurrency/Index.vue
+++ b/src/views/ucurrency/Index.vue
@@ -114,14 +114,14 @@
 
           </div>
         </div>
-        
+
         <div v-if="currentUserRankingData.rankingNo>5" style="margin-top:20px;border-bottom: 1px solid #ddd;padding-bottom:40px">
             <div v-if="currentUserRankingData.rankingNo>5" class="omit">
                 <div>.</div> <div>.</div> <div>.</div>
             </div>
         </div>
-        
-        
+
+
         <div v-if="currentUserRankingData.rankingNo>4" class="table-hear" style="margin-top:40px;border-bottom: 1px solid #ddd;padding-bottom:20px">
           <div style="color: #0059FF;line-height: 40px;padding-left:15px;font-size: 16px;" class="tab-rank">
             {{currentUserRankingData.rankingNo}}</div>
@@ -747,9 +747,10 @@
     .myexperience {
       text-align: right;
       line-height: 75px;
-      margin-left: auto;
+      margin-left: 120px;
       font-size: 14px;
       font-weight: 400;
+      margin-right: -45px;
       color: #666666;
 
       span {

From 04e9e6d6609fa57c36f87326e818acdeeef0b602 Mon Sep 17 00:00:00 2001
From: weinan2087 <weinan2087@163.com>
Date: Wed, 2 Nov 2022 16:13:31 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=B9=E9=BD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/medal/urules.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/medal/urules.vue b/src/views/medal/urules.vue
index 1f195eb1..3871b182 100644
--- a/src/views/medal/urules.vue
+++ b/src/views/medal/urules.vue
@@ -15,7 +15,7 @@
                 <div style="line-height: 58px;" class="grade">LV.{{item.level}}</div>
                 <div class="cont-left">{{item.study}}</div>
                 <div class="cont-right">{{item.day}}</div>
-                <div class="cont-right">{{item.steadily}}</div>
+                <div class="cont-right" style="margin-left:-1%">{{item.steadily}}</div>
                 <div class="cont-left" style="margin-left:6%;margin-right:20px">{{item.popularity}}</div>
             </div>
         </div>

From 8b14496bf64ae9fcf81d67ea130a2ad82bdc88e5 Mon Sep 17 00:00:00 2001
From: lmj <3407000732@qq.com>
Date: Wed, 2 Nov 2022 16:30:33 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/HomePage/homePage.vue | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/components/HomePage/homePage.vue b/src/components/HomePage/homePage.vue
index 6b04c53a..7e0b1919 100644
--- a/src/components/HomePage/homePage.vue
+++ b/src/components/HomePage/homePage.vue
@@ -18,12 +18,18 @@
                     </div>
                      <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">
+                        <span style="color: #A3680A;margin-left:5px;line-height: 24px;margin-right: 20px;">经验值：{{statData.evalue}}</span>
+                      <!-- <div style="float:right"> -->
+                        <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>
                       <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 style="height: 30px;margin-top: 10px;"> -->
+                      
+
+                      <!-- </div> -->
+                      <!-- </div> -->
                     </div>
                     <div class="content-bottom" style="margin-top:20px">
                       <p v-if="userData.sign" class="portal-summary-text">{{userData.sign}} </p>
@@ -31,14 +37,10 @@
                     </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="text-align: center;"> -->
+                      
                      
-                  </div>
+                  <!-- </div> -->
                </div>
            </div>
         </div>