From af84f4aa55de6011890d451dc06f4ad9384a1312 Mon Sep 17 00:00:00 2001
From: lmj <3407000732@qq.com>
Date: Fri, 21 Oct 2022 15:06:35 +0800
Subject: [PATCH 01/14] =?UTF-8?q?=E6=96=87=E7=AB=A0=E9=97=AE=E7=AD=94?=
 =?UTF-8?q?=E7=9A=84=E6=A0=87=E9=A2=98=E5=AD=97=E6=95=B0=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Article/editItems.vue | 2 +-
 src/components/Qa/addQuestion.vue    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/Article/editItems.vue b/src/components/Article/editItems.vue
index 9d378067..3d08d0f2 100644
--- a/src/components/Article/editItems.vue
+++ b/src/components/Article/editItems.vue
@@ -3,7 +3,7 @@
      <el-row class="article-add">
         <el-form ref="form" :rules="rules" :model="addForm" label-position="right" label-width="80px">
           <el-form-item prop="title" label="标题">
-            <el-input class="title-input" v-model.trim="addForm.title" placeholder="请输入文章标题,长度在 1 到 100 个字符" show-word-limit  maxlength="100"></el-input>
+            <el-input class="title-input" v-model.trim="addForm.title" placeholder="请输入文章标题,长度在 1 到 50 个字符" show-word-limit  maxlength="50"></el-input>
           </el-form-item>
           <el-form-item class="imgInstructions" label="封面">
             <div class="el-form-item__content">
diff --git a/src/components/Qa/addQuestion.vue b/src/components/Qa/addQuestion.vue
index d424743b..c8ba149b 100644
--- a/src/components/Qa/addQuestion.vue
+++ b/src/components/Qa/addQuestion.vue
@@ -10,7 +10,7 @@
          <el-dialog :close-on-click-modal='false' title="提问题" label-width="80px" :visible.sync="askQuestionDialog">
            <!-- <el-form ref="askForm" :model="askForm" :rules="askFormRules" label-position="right" > -->
              <el-form-item label="标题:" prop="title">
-        <el-input class="title-input"   v-model="askForm.title" show-word-limit placeholder="请输入问题标题,字符长度不能高于100" maxlength="100"></el-input>
+        <el-input class="title-input"   v-model="askForm.title" show-word-limit placeholder="请输入问题标题,字符长度不能高于50" maxlength="50"></el-input>
       </el-form-item>
         <el-form-item label="封面">
         <imageUpload :value="imageShowUrl" dir="qa" width="410px" height="168px"  @success="handleUploadSuccess" @remove="handleRemoveSuccess"></imageUpload>

From cd31c7c8012b7eb08d4ea07657cf93d2ba85a7d9 Mon Sep 17 00:00:00 2001
From: weinan2087 <weinan2087@163.com>
Date: Fri, 21 Oct 2022 15:12:19 +0800
Subject: [PATCH 02/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E7=AC=94=E8=AE=B0=E5=AF=BC=E5=87=BA=E4=B9=B1=E7=A0=81=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/phase2/note.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/api/phase2/note.js b/src/api/phase2/note.js
index 7d4b2c34..c5612563 100644
--- a/src/api/phase2/note.js
+++ b/src/api/phase2/note.js
@@ -106,8 +106,8 @@ const ids=function (data){
  * }
  * */
 const exportExcel=function (data){
-  // return ajax.postJsonToFile(baseURL,'/xboe/subgroup/m/noteinfo/exportExcel',data);
-  return ajax.post(baseURL,'/xboe/subgroup/m/noteinfo/exportExcel',data);
+  return ajax.postJsonToFile(baseURL,'/xboe/subgroup/m/noteinfo/exportExcel',data);
+  // return ajax.post(baseURL,'/xboe/subgroup/m/noteinfo/exportExcel',data);
 }
 
 /**

From b417d678a6bc9c84a5ad7cabe0e11b3fff15df38 Mon Sep 17 00:00:00 2001
From: zhaofang <752743406@qq.com>
Date: Fri, 21 Oct 2022 15:18:48 +0800
Subject: [PATCH 03/14] =?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/Portal/guideBox.vue | 2 +-
 src/views/user/Mynotes.vue         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/Portal/guideBox.vue b/src/components/Portal/guideBox.vue
index c2a71051..dcf221ae 100644
--- a/src/components/Portal/guideBox.vue
+++ b/src/components/Portal/guideBox.vue
@@ -57,7 +57,7 @@
                 disableOnInteraction: false ,
                 delay: 2000,
                 },
-                speed: 1000, //切换速度，即slider自动滑动开始到结束的时间（单位ms）
+                speed: 2000, //切换速度，即slider自动滑动开始到结束的时间（单位ms）
                 loop:true, //循环切换
                 observe:true,
                 peed: 300,//循环速度
diff --git a/src/views/user/Mynotes.vue b/src/views/user/Mynotes.vue
index ffbffdb8..389d2afe 100644
--- a/src/views/user/Mynotes.vue
+++ b/src/views/user/Mynotes.vue
@@ -68,7 +68,7 @@
                   <span style="margin-left:14px">{{item.openType == 9?'公开':'私密'}}</span>
                   <h6>{{ item.sysUpdateTime }}</h6>
               </div>
-              <div class="all-content">
+              <div class="all-content" style="word-break:break-all;">
                  <span v-if="item.contentType != 3">{{ item.content }}</span>
                  <div v-else>
                     <template v-for="img in item.content">

From 5f11b71ca7379650f1488e92599ecc955ba16076 Mon Sep 17 00:00:00 2001
From: 86182 <bjy18234674226@163.com>
Date: Fri, 21 Oct 2022 15:26:00 +0800
Subject: [PATCH 04/14] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=8A=A8=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/phase2/stat.js | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/api/phase2/stat.js b/src/api/phase2/stat.js
index ffd539b9..d1c927f5 100644
--- a/src/api/phase2/stat.js
+++ b/src/api/phase2/stat.js
@@ -48,6 +48,20 @@ const userDynamicList = function(data) {
     return ajax.post(baseURL,'/xboe/m/stat/userdynamic/list',data);
 }
 
+/**
+ * 用户动态，分页查询
+ *
+ * @param {
+   pageIndex,
+   pageSize,
+   contentType:'',内容类型
+   aid 数组
+ } data
+ */
+const userDynamicfollows = function(data) {
+  return ajax.postJson(baseURL,'/xboe/m/stat/userdynamic/follows',data);
+}
+
 /**
  * 获取用户全部勋章
  * @param {String} aid 用户的id
@@ -131,6 +145,7 @@ const getRanking = function(queryData) {
 }
 
 
+
 export default {
     sendEvent,
     userTotal,
@@ -142,5 +157,6 @@ export default {
     dynamicHide,
     exportUserCoinRecord,
     getRanking,
-    getUserStatTotalInfo
+    getUserStatTotalInfo,
+  userDynamicfollows
 }

From 209c4b86e204816bd2b4b205ef0d5121fd1d1f4a Mon Sep 17 00:00:00 2001
From: lmj <3407000732@qq.com>
Date: Fri, 21 Oct 2022 15:37:31 +0800
Subject: [PATCH 05/14] =?UTF-8?q?=E9=97=AE=E7=AD=94=E4=BA=8C=E7=BA=A7?=
 =?UTF-8?q?=E4=B8=89=E7=BA=A7=E5=9B=9E=E5=A4=8D=E4=B8=AA=E6=80=A7=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/portal/qa/Answer.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/portal/qa/Answer.vue b/src/views/portal/qa/Answer.vue
index c3538cf8..2b98fa09 100644
--- a/src/views/portal/qa/Answer.vue
+++ b/src/views/portal/qa/Answer.vue
@@ -165,7 +165,7 @@
                                 :class="rowIdx === con.answers.length - 1 ? 'comment-last' : ''">
                                 <div class="comment-top">
                                   <div class="comment-author">
-                                    <author :aid="row.sysCreateAid" :avatar="row.avatar" :name="row.sysCreateBy" :sex="row.sex"></author>
+                                    <author :aid="row.sysCreateAid" :avatar="row.avatar" :name="row.sysCreateBy" :sex="row.sex" :sign="row.sign"></author>
                                     <span class="comment-author-text">回复</span>
                                     <span style="margin-left: 10px; font-size:14px">{{ row.replayName }}</span>
                                   </div>
@@ -520,6 +520,7 @@ export default {
             res.result.list.forEach(item => {
               item.avatar = "";
               item.sex = null;
+              item.sign = " "; 
               item.isAll = false;//字数过大时，显示隐藏控制
               allList.push(item);
               ids.push(item.sysCreateAid);
@@ -527,6 +528,7 @@ export default {
                 item.answers.forEach(answers => {
                   answers.avatar = "";
                   answers.sex = null;
+                  answers.sign = " ";
                   answers.isAll = false;
                   allList.push(answers);
                   level3ParentIds.push(answers.id);

From 3a23065796cf7acb30da9c8e128f57bc8b2f4a5f Mon Sep 17 00:00:00 2001
From: lmj <3407000732@qq.com>
Date: Fri, 21 Oct 2022 15:38:01 +0800
Subject: [PATCH 06/14] =?UTF-8?q?=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/user/Mynotes.vue b/src/views/user/Mynotes.vue
index 389d2afe..fe9387ec 100644
--- a/src/views/user/Mynotes.vue
+++ b/src/views/user/Mynotes.vue
@@ -256,7 +256,7 @@ export default {
   methods: {
     routerTo(item) {
         if(item.courseId) {
-            this.$router.push('/course/studyindex?id+'+item.courseId);
+            this.$router.push('/course/studyindex?id='+item.courseId);
         }
     },
     exportCommand(e) {

From da209eafdd980cb3b4324c1a623860518b0a1a3e Mon Sep 17 00:00:00 2001
From: weinan2087 <weinan2087@163.com>
Date: Fri, 21 Oct 2022 15:38:16 +0800
Subject: [PATCH 07/14] =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=AC=94=E8=AE=B0?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=90=8E=E8=B7=B3=E8=BD=AC=E5=88=B0=E7=AC=94?=
 =?UTF-8?q?=E8=AE=B0=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/user/Noteedit.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/user/Noteedit.vue b/src/views/user/Noteedit.vue
index c9aa8bd6..2daf4f95 100644
--- a/src/views/user/Noteedit.vue
+++ b/src/views/user/Noteedit.vue
@@ -177,11 +177,11 @@ export default {
                   },10000*2)
                } else {
                   this.notedetail()
-                  this.$message({
-                  message: '笔记保存成功',
-                  type: 'success',
-                  center: true
-               });
+                  this.$message({message: '笔记保存成功',type: 'success',center: true});
+                  // 跳转到笔记列表
+                  clearInterval(this.timer);
+                  this.timer = null;
+                  this.$router.go(-1);
                }
             } else {
                this.isShowTip = '当前网络异常，内容已离线保存，请尝试连接网络后重新自动上传！';

From 362027e6c175fdade98060198be39a02b53bb93f Mon Sep 17 00:00:00 2001
From: lmj <3407000732@qq.com>
Date: Fri, 21 Oct 2022 16:00:17 +0800
Subject: [PATCH 08/14] =?UTF-8?q?=E8=B5=84=E6=BA=90=E4=BD=8D=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/portal/article/Detail.vue |  6 +++---
 src/views/portal/article/Index.vue  |  6 +++---
 src/views/portal/case/Detail.vue    |  6 +++---
 src/views/portal/case/Index.vue     | 10 +++++-----
 src/views/portal/course/Index.vue   |  6 +++---
 src/views/portal/qa/Answer.vue      | 11 ++++++-----
 src/views/portal/qa/Detail.vue      |  6 +++---
 src/views/portal/qa/Index.vue       |  6 +++---
 8 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/src/views/portal/article/Detail.vue b/src/views/portal/article/Detail.vue
index ac94a534..bedbdfed 100644
--- a/src/views/portal/article/Detail.vue
+++ b/src/views/portal/article/Detail.vue
@@ -80,10 +80,10 @@
                     </li>
                 </ul>
               </div>
-              <div class="course-resources">
+              <!-- <div class="course-resources"> -->
                 <!-- 资源位 -->
-                <img :src="fileBaseUrl + resonimg.image" alt="">
-              </div>
+                <!-- <img :src="fileBaseUrl + resonimg.image" alt=""> -->
+              <!-- </div> -->
           </div>
             </div>
          </div>
diff --git a/src/views/portal/article/Index.vue b/src/views/portal/article/Index.vue
index c0cfd636..b3eda535 100644
--- a/src/views/portal/article/Index.vue
+++ b/src/views/portal/article/Index.vue
@@ -100,10 +100,10 @@
                       </li>
                     </ul>
               </div>
-              <div class="course-resources">
+              <!-- <div class="course-resources"> -->
                 <!-- 资源位 -->
-                <img :src="fileBaseUrl + resonimg.image" alt="">
-              </div>
+                <!-- <img :src="fileBaseUrl + resonimg.image" alt=""> -->
+              <!-- </div> -->
           </div>
 
 
diff --git a/src/views/portal/case/Detail.vue b/src/views/portal/case/Detail.vue
index a45495e6..9006bcdc 100644
--- a/src/views/portal/case/Detail.vue
+++ b/src/views/portal/case/Detail.vue
@@ -151,10 +151,10 @@
                    </li>
               </ul>
             </div>
-             <div class="course-resources">
+             <!-- <div class="course-resources"> -->
                 <!-- 资源位 -->
-                <img :src="fileBaseUrl + resonimg.image" alt="">
-              </div>
+                <!-- <img :src="fileBaseUrl + resonimg.image" alt=""> -->
+              <!-- </div> -->
            </div>
           </div>
         </div>
diff --git a/src/views/portal/case/Index.vue b/src/views/portal/case/Index.vue
index 656a21ac..a9915675 100644
--- a/src/views/portal/case/Index.vue
+++ b/src/views/portal/case/Index.vue
@@ -16,7 +16,7 @@
                 <div class="search-item">
                     <div style="margin-top:10px; display: flex;">
                       <div style="line-height: 25px;padding-right: 10px;">
-                        <img class="orgaicon" :src="`${webBaseUrl}/images/orgaimg.png`" alt="">
+                        <!-- <img class="orgaicon" :src="`${webBaseUrl}/images/orgaimg.png`" alt=""> -->
                         <span class="item-title" >组织领域</span>
                         <span class="item-line"></span>
                       </div>
@@ -33,7 +33,7 @@
 
                       <div style="margin-top:10px; display: flex;">
                         <div style="line-height: 25px;padding-right: 10px;">
-                           <img class="orgaicon" :src="`${webBaseUrl}/images/specimg.png`" alt="">
+                           <!-- <img class="orgaicon" :src="`${webBaseUrl}/images/specimg.png`" alt=""> -->
                       <span class="item-title" >专业分类</span>
                       <span class="item-line"></span>
                        </div>
@@ -174,10 +174,10 @@
                    </li>
                 </ul>
               </div>
-               <div class="course-resources">
+               <!-- <div class="course-resources"> -->
                 <!-- 资源位 -->
-                <img :src="fileBaseUrl + resonimg.image" alt="">
-              </div>
+                <!-- <img :src="fileBaseUrl + resonimg.image" alt=""> -->
+              <!-- </div> -->
            </div>
       </div>
       <div style="height: 50px;"></div>
diff --git a/src/views/portal/course/Index.vue b/src/views/portal/course/Index.vue
index 3224c44d..a395e914 100644
--- a/src/views/portal/course/Index.vue
+++ b/src/views/portal/course/Index.vue
@@ -267,10 +267,10 @@
                    </li>
                 </ul>
               </div>
-              <div class="course-resources">
+              <!-- <div class="course-resources"> -->
                 <!-- 资源位 -->
-                <img :src="fileBaseUrl + resonimg.image" alt="">
-              </div>
+                <!-- <img :src="fileBaseUrl + resonimg.image" alt=""> -->
+              <!-- </div> -->
             </div>
         </div>
       </div>
diff --git a/src/views/portal/qa/Answer.vue b/src/views/portal/qa/Answer.vue
index 2b98fa09..804c70d8 100644
--- a/src/views/portal/qa/Answer.vue
+++ b/src/views/portal/qa/Answer.vue
@@ -257,10 +257,10 @@
                           </li>
                         </ul>
                   </div>
-                  <div class="course-resources">
+                  <!-- <div class="course-resources"> -->
                         <!-- 资源位 -->
-                        <img :src="fileBaseUrl + resonimg.image" alt="">
-                  </div>
+                        <!-- <img :src="fileBaseUrl + resonimg.image" alt=""> -->
+                  <!-- </div> -->
             </div>
         </div>
       </div>
@@ -936,8 +936,9 @@ export default {
 
 .ranking-title {
   line-height: 34px;
-  font-size: 15px;
-  color: #333333;
+  font-size: 24px;
+  font-weight: 500;
+  color: #000;
 
   .center-titlt {
     font-size: 15px;
diff --git a/src/views/portal/qa/Detail.vue b/src/views/portal/qa/Detail.vue
index 66f820cd..924d13f7 100644
--- a/src/views/portal/qa/Detail.vue
+++ b/src/views/portal/qa/Detail.vue
@@ -184,10 +184,10 @@
                         </ul>
                     </div>
 
-               <div class="course-resources">
+               <!-- <div class="course-resources"> -->
                         资源位
-               <img :src="fileBaseUrl + resonimg.image" alt="">
-              </div>
+               <!-- <img :src="fileBaseUrl + resonimg.image" alt=""> -->
+              <!-- </div> -->
           </div>
 
          </div>
diff --git a/src/views/portal/qa/Index.vue b/src/views/portal/qa/Index.vue
index 3846b6ad..a37130b4 100644
--- a/src/views/portal/qa/Index.vue
+++ b/src/views/portal/qa/Index.vue
@@ -103,10 +103,10 @@
                         </li>
                         </ul>
                     </div>
-                      <div class="course-resources">
+                      <!-- <div class="course-resources"> -->
                         <!-- 资源位 -->
-                        <img :src="fileBaseUrl + resonimg.image" alt="">
-                      </div>
+                        <!-- <img :src="fileBaseUrl + resonimg.image" alt=""> -->
+                      <!-- </div> -->
                   </div>
             <!-- </div> -->
 

From a225d32131fb6328c80e6648c623965d19d85bb4 Mon Sep 17 00:00:00 2001
From: lmj <3407000732@qq.com>
Date: Fri, 21 Oct 2022 16:33:10 +0800
Subject: [PATCH 09/14] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E7=AC=AC=E4=B8=80?=
 =?UTF-8?q?=E4=BD=8D=E5=9B=BE=E7=89=87=E5=8E=BB=E6=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/portal/course/Index.vue | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/views/portal/course/Index.vue b/src/views/portal/course/Index.vue
index a395e914..f8600b40 100644
--- a/src/views/portal/course/Index.vue
+++ b/src/views/portal/course/Index.vue
@@ -23,7 +23,8 @@
                   <el-radio-group v-model="category" size="mini" @change="searchData">
                     <el-radio-button :label="null">全部</el-radio-button>
                     <el-radio-button :label="20">录播课</el-radio-button>
-                    <el-radio-button :label="30">线下课</el-radio-button>
+                    <el-radio-button :label="30">线下课 </el-radio-button>
+                    <el-radio-button class="couderbox"> <div class="coures-border"></div> </el-radio-button>
                     <el-radio-button :label="40">学习项目</el-radio-button>
                   </el-radio-group>
                   </div>
@@ -39,6 +40,7 @@
                     <el-radio-group  v-model="types.sysTypes" size="mini" @change="changeType">
                       <el-radio-button :label="null">全部</el-radio-button>
                       <el-radio-button v-for="item in optionsList" :key="item.id" :label="item.id">{{item.name}}</el-radio-button>
+                    <el-radio-button class="couderbox"> <div class="coures-border"></div> </el-radio-button>
                     </el-radio-group>
                       <span @click="jumUX()" class="Uxtext" style=""> U选小课堂
                           <span class="uxicon">
@@ -148,7 +150,7 @@
                         </span>
                         <span class="portal-title-desc title-line-ellipsis" v-if="item.images == ''" style="font-size: 14px;">{{ item.name }}</span>
                         <span class="portal-title-desc" v-else style="font-size: 14px;">
-                          <img v-if="index == 0"  class="rankimg"  :src="fileBaseUrl + item.images" alt=""/>
+                          <!-- <img v-if="index == 0"  class="rankimg"  :src="fileBaseUrl + item.images" alt=""/> -->
                           <span class="portal-images-title two-line-ellipsis">{{ item.name }}</span>
                         </span>
 
@@ -195,7 +197,7 @@
                         </span>
                         <span class="portal-title-desc title-line-ellipsis" v-if="item.images == ''" style="font-size: 14px;">{{ item.name }}</span>
                         <span class="portal-title-desc" v-else style="font-size: 14px;">
-                          <img v-if="index == 0" class="rankimg"  :src="fileBaseUrl + item.images" alt=""/>
+                          <!-- <img v-if="index == 0" class="rankimg"  :src="fileBaseUrl + item.images" alt=""/> -->
                           <span class="portal-images-title two-line-ellipsis">{{ item.name }}</span>
                         </span>
 
@@ -242,7 +244,7 @@
                         </span>
                         <span class="portal-title-desc title-line-ellipsis list-lidex" v-if="item.images == ''" style="font-size: 14px;">{{ item.courseName }}</span>
                         <span class="portal-title-desc " v-else style="font-size: 14px;">
-                          <img v-if="index == 0" class="rankimg"  :src="fileBaseUrl + item.images" alt=""/>
+                          <!-- <img v-if="index == 0" class="rankimg"  :src="fileBaseUrl + item.images" alt=""/> -->
                           <span class="portal-images-title two-line-ellipsis">{{ item.courseName }}</span>
                         </span>
                         <div class="list-active">
@@ -874,6 +876,18 @@ export default {
 </script>
 
 <style scoped lang="scss">
+.couderbox{
+  // width: 5px;
+  // padding: 0;
+  // display: inline-block;
+  // text-align: center;
+}
+.coures-border{
+  width: 2px;
+  height: 15px;
+  border-radius: 20%;
+  background: #666;
+}
 .notcoures{
   text-align: center;
   img{

From 24cd868111e027d6ccf43cfe2cff233ce861f7be Mon Sep 17 00:00:00 2001
From: weinan2087 <weinan2087@163.com>
Date: Fri, 21 Oct 2022 16:40:20 +0800
Subject: [PATCH 10/14] =?UTF-8?q?=E6=8C=89=E7=85=A7=E9=9C=80=E6=B1=82?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=85=B3=E6=B3=A8=E4=B8=8E=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E5=85=B3=E6=B3=A8=E7=9A=84=E6=8F=90=E7=A4=BA=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/HomePage/homePage.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/HomePage/homePage.vue b/src/components/HomePage/homePage.vue
index e2efd0ca..865a539d 100644
--- a/src/components/HomePage/homePage.vue
+++ b/src/components/HomePage/homePage.vue
@@ -119,6 +119,7 @@
           apiFollow.remove(this.pageId).then(res=>{
             if(res.status == 200) {
                this.isFollowHas = false;
+			   this.$message.success("取消关注成功");
             } else {
               this.$message.error(res.message);
             }
@@ -157,7 +158,7 @@
         toFollow() {
           apiFollow.save(this.pageId).then(res=>{
             if(res.status == 200) {
-              this.$message.success(res.message);
+              this.$message.success("关注成功");
               this.followHas();
             } else {
               this.$message.error(res.message);

From 58af73822fae32357013d0caa8ef9ba09994bdf4 Mon Sep 17 00:00:00 2001
From: lmj <3407000732@qq.com>
Date: Fri, 21 Oct 2022 17:07:24 +0800
Subject: [PATCH 11/14] =?UTF-8?q?=E6=96=87=E5=AD=97=E7=A9=BA=E6=A0=BC?=
 =?UTF-8?q?=E5=92=8C=E6=A1=88=E4=BE=8B=E6=A0=87=E9=A2=98=E6=BA=A2=E5=87=BA?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/portal/case/Index.vue | 2 +-
 src/views/ucurrency/Index.vue   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/portal/case/Index.vue b/src/views/portal/case/Index.vue
index a9915675..026cf613 100644
--- a/src/views/portal/case/Index.vue
+++ b/src/views/portal/case/Index.vue
@@ -776,7 +776,7 @@ export default {
     font-size: 18px;
     font-weight: 600;
     color: #333333;
-    width: 73%;
+    width: 67%;
     display: -webkit-box;
     overflow: hidden;
     word-break: break-all;
diff --git a/src/views/ucurrency/Index.vue b/src/views/ucurrency/Index.vue
index 9e29a254..fc65dd87 100644
--- a/src/views/ucurrency/Index.vue
+++ b/src/views/ucurrency/Index.vue
@@ -27,7 +27,7 @@
         <div v-else class="home-no-list" style="margin-top:150px">
           <img class="img" style="width:76px;height:76px" :src="`${webBaseUrl}/images/homeWu/u-wu.png`" alt=""
             srcset="">
-          <p class="text">最近7天你可能太忙了，快开始 努力获得U币吧</p>
+          <p class="text">最近7天你可能太忙了，快开始努力获得U币吧</p>
         </div>
       </div>
     </div>

From 8f506470eb981e6badda556ae290c352ad13f2e1 Mon Sep 17 00:00:00 2001
From: weinan2087 <weinan2087@163.com>
Date: Fri, 21 Oct 2022 17:38:09 +0800
Subject: [PATCH 12/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=92=E8=A1=8C?=
 =?UTF-8?q?=E6=A6=9C=EF=BC=88=E7=BB=8F=E9=AA=8C=E5=80=BC=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/user/ranking.vue | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/views/user/ranking.vue b/src/views/user/ranking.vue
index 728569f9..45126084 100644
--- a/src/views/user/ranking.vue
+++ b/src/views/user/ranking.vue
@@ -32,6 +32,8 @@
                  我的经验值 :  <span>{{currentUserRankingTotalData.rankValue}}</span>
              </div>
           </div>
+
+          <!--
           <div class="exp-bar">
             <h6> {{currentUserRankingTotalData.rankValue}}/{{currentUserRankingTotalData.endValue}}</h6>
             <div class="exp-barbox">
@@ -42,7 +44,9 @@
                 <span>{{current.end}}</span>
             </div>
           </div>
-          <div class="exp-table" style="margin-top:36px;height:500px;overflow-y:auto">
+          -->
+
+          <div class="exp-table" style="margin-top:20px;height:600px;overflow-y:auto">
              <div class="table-hear">
                 <div style="margin-left:5px">排名</div>
                 <div style="margin-left:5px">姓名</div>
@@ -72,10 +76,10 @@
                  </div>
              </div>
              </div>
-             <div v-if="experience.data.rankingNo>4" class="omit">
+             <div v-if="experience.data.rankingNo>5" class="omit">
                  <div>.</div> <div>.</div> <div>.</div>
              </div>
-             <div v-if="experience.data.rankingNo>4" class="table-hear" style="margin-top:40px;border-bottom: 1px solid #ddd;padding-bottom:20px">
+             <div v-if="experience.data.rankingNo>5" 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" >{{experience.data.rankingNo}}</div>
                  <div class="tab-name" v-if="experience.data.authorInfo && experience.data.authorInfo.aid">
                     <author-img :avatar="userInfo.avatar" :aid="experience.data.authorInfo.aid" :sex="experience.data.authorInfo.sex"></author-img>
@@ -125,15 +129,14 @@
                  我的排名 :  <span> {{learningDurationTotalData.rankNo}}</span>
              </div>
              <div class="myexperience">
-                 我的学习时长:  <span> {{formatSecondToHour(learningDurationTotalData.rankValue)}}</span> h
+                 我的学习时长:  <span> {{formatSecondToHour(learningDurationTotalData.rankValue)}}</span>
              </div>
           </div>
            <div class="exp-table" style="margin-top:20px;height:600px;overflow-y:auto">
              <div class="table-hear">
                 <div style="margin-left:5px">排名</div>
                 <div style="margin-left:5px">姓名</div>
-                <!-- <div class="bm">学习时长:小时</div> -->
-                <div style="margin-left:36%;">学习时长:小时</div>
+                <div style="margin-left:36%;">学习时长</div>
              </div>
              <div>
             <div class="table-hear" style="margin-top:40px;border-bottom: 1px solid #ddd;padding-bottom:20px" v-for="(lan,idx) in learningDuration.list" :key="lan.id">
@@ -361,7 +364,7 @@ export default {
       aid:this.userInfo.aid,// #用户id
       statType:20, // #统计类型  10学习时长 11 学习天数 20表经验值 30表u币 40表获取天数
       field:this.experience.field,// #统计周期 todays-当天,weeks-周,months-月,years-年 total-总计
-      num:4,//  #显示的条数
+      num:5,//  #显示的条数
   }
   apiStat.getRanking(data).then(res=>{
       if(res.status==200){

From 0780673c6aa9a0f2719985da02ed05d06ba97f15 Mon Sep 17 00:00:00 2001
From: lmj <3407000732@qq.com>
Date: Fri, 21 Oct 2022 17:43:03 +0800
Subject: [PATCH 13/14] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E5=AF=BC=E8=88=AA=E5=92=8C=E6=8C=87=E7=A4=BA=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/PortalHeader.vue |  3 ++-
 src/views/Index.vue             | 12 +++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/components/PortalHeader.vue b/src/components/PortalHeader.vue
index 24d76a4e..94df2a76 100644
--- a/src/components/PortalHeader.vue
+++ b/src/components/PortalHeader.vue
@@ -362,7 +362,8 @@ text-align: center;
   // margin: 0 87px;
   height: 72px;
   display: flex;
-  background: rgba(255,255,255,0.12);
+  background: rgba(255,255,255,0.1);
+  border: 1px solid rgba(61,61,61,0.15);
   backdrop-filter: blur(10px);
 }
 .portal-top{
diff --git a/src/views/Index.vue b/src/views/Index.vue
index 9771b970..e9a2ddb1 100644
--- a/src/views/Index.vue
+++ b/src/views/Index.vue
@@ -1298,24 +1298,26 @@
   ::v-deep .swiper-pagination{
      line-height: 25px;
      height: 32px;
-      background: rgba(0,0,0,0.5);
       border-radius: 19px;
     //  background: rgba($color: #000000, $alpha: 0.1);
      width: auto;
-     left:48%;
+     left:45%;
      padding: 0 20px;
      border-radius: 19px;
      .swiper-pagination-bullet{
-      background: #000;
       width: 24px;
       height: 2px;
-      background: rgba($color: #fff, $alpha: 0.5);
+       background: #fff;
+       opacity: 1 !important;
+      // background: rgba($color: #fff, $alpha: 0.5);
       border-radius: 2px;
     }
       .swiper-pagination-bullet-active{
         height: 2px;
+       opacity: 1 !important;
         width: 24px;
-        background: rgba($color: #fff, $alpha: 0.8);
+        background: #387DF7;
+        // background: rgba($color: #fff, $alpha: 0.8);
         border-radius: 2px;
       }
       .swiper-container{

From f4b922037bb689209fcc44c6dc6dd2c4fa1e3320 Mon Sep 17 00:00:00 2001
From: weinan2087 <weinan2087@163.com>
Date: Fri, 21 Oct 2022 18:07:12 +0800
Subject: [PATCH 14/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=8F=E9=AA=8C?=
 =?UTF-8?q?=E5=80=BC=E6=8E=92=E8=A1=8C=E6=A6=9C=E6=98=BE=E7=A4=BA=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E6=9D=A1=E4=BB=B6=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ucurrency/Index.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/views/ucurrency/Index.vue b/src/views/ucurrency/Index.vue
index fc65dd87..7eee59fc 100644
--- a/src/views/ucurrency/Index.vue
+++ b/src/views/ucurrency/Index.vue
@@ -110,8 +110,7 @@
           <div>.</div>
           <div>.</div>
         </div>
-        <div class="table-hear" style="margin-top:40px;border-bottom: 1px solid #ddd;padding-bottom:20px"
-          v-if="currentUserRankingData.authorInfo && currentUserRankingData.authorInfo.aid && currentUserRankingData.rankingNo>4">
+        <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>
           <div class="tab-name">