diff --git a/src/components/Course/myNote.vue b/src/components/Course/myNote.vue
index 265823a2..cbb42c77 100644
--- a/src/components/Course/myNote.vue
+++ b/src/components/Course/myNote.vue
@@ -9,7 +9,7 @@
             <div class="newcote-content" v-if="notetab == 1">
                 <div class="newcote-time" v-if="play_Time != 0">
                     <img :src="`${webBaseUrl}/images/coteplay.png`" />
-                    {{formatSeconds(play_Time)}}1
+                    {{formatSeconds(play_Time)}}
                     <img :src="`${webBaseUrl}/images/cotedetel.png`" @click="play_Time = 0" />
                 </div>
                 <div class="newcote-text">
diff --git a/src/components/HomePage/followList.vue b/src/components/HomePage/followList.vue
index 27325b3c..0bfd1151 100644
--- a/src/components/HomePage/followList.vue
+++ b/src/components/HomePage/followList.vue
@@ -262,7 +262,7 @@ import apiUser from "@/api/system/user.js";
                })
                this.followMe.list = res.result.list;
                //console.log(this.mypageList,'this.mypageList');
-               this.getUserData(res.result.list);
+               this.getUserData(res.result.list,2);
             }else{
               console.log('加载关注我数据错误:'+res.message);
             }
@@ -280,26 +280,26 @@ import apiUser from "@/api/system/user.js";
                 item.userFollow.authorInfo = { aid: "",name: "",orgInfo: "",avatar: "",sex: null ,sign:''}
              })
              this.follow.list = res.result.list;
-             this.getUserData(res.result.list);
+             this.getUserData(res.result.list, 1);
           }
         })
        },
-       getUserData(list) {
+      //  num  判断是哪个接口
+       getUserData(list,num) {
             let ids = [];
-            if(this.active == 2) {
+            if(num == 2) {
               ids = list.map(item=> item.userFollow.aid);
             } else {
               ids = list.map(item=> item.userFollow.followId);
             }
-
             apiUser.getByIds(ids).then(res => {
                 if (res.status == 200) {
                     list.forEach((item, index) => {
                         res.result.some(author => {
-                          if (this.active == 1 && author.aid == item.userFollow.followId) {
+                          if (num == 1 && author.aid == item.userFollow.followId) {
                               item.userFollow.authorInfo = author;
                               return true;
-                          } else if(this.active == 2 && author.aid == item.userFollow.aid){
+                          } else if(num == 2 && author.aid == item.userFollow.aid){
                               item.userFollow.authorInfo = author;
                               return true;
                           } else {
diff --git a/src/components/UserCenter/menu.vue b/src/components/UserCenter/menu.vue
index d239cbc0..a1408825 100644
--- a/src/components/UserCenter/menu.vue
+++ b/src/components/UserCenter/menu.vue
@@ -93,14 +93,14 @@
           <svg-icon icon-class="interlocution"></svg-icon>
           <span slot="title">问答管理</span>
         </el-menu-item>
-        <el-menu-item v-show="curIdentity == 3" index="008">
+        <el-menu-item v-show="curIdentity == 3">
           <template slot="title">
             <svg-icon icon-class="administrator" style="font-size:17px"></svg-icon>
             <span><a href="/resource/index.html" target="_blank" style="color:#303133;">旧版管理员界面</a></span>
           </template>
           <!-- <i class="el-icon-menu"></i> -->
         </el-menu-item>
-        <el-menu-item v-show="curIdentity == 3" index="009">
+        <el-menu-item v-show="curIdentity == 3">
           <template slot="title">
             <svg-icon icon-class="management" style="font-size:16px"></svg-icon>
             <span><a href="https://u.boe.com/train/manager/index.html" style="color:#303133;" target="_blank">业务支援读书会管理</a></span>
diff --git a/src/views/Index.vue b/src/views/Index.vue
index 56fafca4..48374339 100644
--- a/src/views/Index.vue
+++ b/src/views/Index.vue
@@ -442,7 +442,7 @@
            </span>
            <div style="text-align: center;"><img :src="`${webBaseUrl}/images/login_medal.png`" width="206px" height="269px" alt=""></div>
            <div style="text-align: left;padding:20px 60px 100px 60px">
-             <div class="jntext1">感谢有你 一路相伴</div>
+             <div class="jntext1">感谢有您 一路相伴</div>
              <div class="jntext2">勋章领取条件:</div>
              <div class="jntext3">2022年11月4日-11月19日登录过平台学习的校友</div>
            </div>
diff --git a/src/views/homepage/page.vue b/src/views/homepage/page.vue
index 7f476fe5..8acfef87 100644
--- a/src/views/homepage/page.vue
+++ b/src/views/homepage/page.vue
@@ -6,7 +6,7 @@
             <i style="color: #333333" class="el-icon-search"></i>
         </div> -->
         <el-tabs v-model="activeName" @tab-click="handleClick">
-            <el-tab-pane name="">
+            <el-tab-pane name="" v-loading="loading">
                 <span slot="label"><svg-icon icon-class="home-dynamic" style="font-size: 30px;"></svg-icon> <span class="tabs-info">动态</span></span>
                 <template v-for="item in allPageList">
                     <course-list v-if="item.contentType == 1" :list="[item]" :isDynamic="true" :personal="personal"  @hideIndex="dynamicHide"></course-list>
@@ -17,27 +17,27 @@
                     <article-list v-if="item.contentType == 2" :list="[item]" :isDynamic="true" :personal="personal"  @hideIndex="dynamicHide"></article-list>
                 </template>
             </el-tab-pane>
-            <el-tab-pane name="1">
+            <el-tab-pane name="1" v-loading="loading1">
                 <span slot="label"><svg-icon icon-class="home-course" style="font-size: 30px;"></svg-icon><span class="tabs-info">课程</span></span>
                 <course-list :list="cousrePageList" :isDynamic="false" :personal="personal" @hideIndex="dynamicHide"></course-list>
             </el-tab-pane>
-            <el-tab-pane name="3">
+            <el-tab-pane name="3" v-loading="loading3">
                 <span slot="label"><svg-icon icon-class="home-case" style="font-size: 30px;"></svg-icon><span class="tabs-info">案例</span></span>
                 <case-list :list="casePageList" :isDynamic="false" :personal="personal" @hideIndex="dynamicHide"></case-list>
             </el-tab-pane>
-            <el-tab-pane name="6">
+            <el-tab-pane name="6" v-loading="loading6">
                 <span slot="label"><svg-icon icon-class="home-note" style="font-size: 30px;"></svg-icon><span class="tabs-info">笔记</span></span>
                 <note-list :list="notePageList" :isDynamic="false" :personal="personal" @hideIndex="dynamicHide"></note-list>
             </el-tab-pane>
-            <el-tab-pane name="4">
+            <el-tab-pane name="4" v-loading="loading4">
                 <span slot="label"><svg-icon icon-class="home-qa" style="font-size: 30px;"></svg-icon><span class="tabs-info">提问</span></span>
                 <put-list :list="qaPageList" :isDynamic="false" :personal="personal" @hideIndex="dynamicHide"></put-list>
             </el-tab-pane>
-            <el-tab-pane name="5">
+            <el-tab-pane name="5" v-loading="loading5">
                 <span slot="label"><svg-icon icon-class="home-answer" style="font-size: 30px;"></svg-icon><span class="tabs-info">回答</span></span>
                 <answer-list :list="answerPageList" :isDynamic="false" :personal="personal" @hideIndex="dynamicHide"></answer-list>
             </el-tab-pane>
-            <el-tab-pane name="2">
+            <el-tab-pane name="2" v-loading="loading2">
                 <span slot="label"><svg-icon icon-class="home-article" style="font-size: 30px;"></svg-icon><span class="tabs-info">文章</span></span>
                 <article-list :list="articlePageList" :isDynamic="false" :personal="personal" @hideIndex="dynamicHide"></article-list>
             </el-tab-pane>
@@ -97,6 +97,13 @@
         },
         data(){
             return{
+                loading:false,
+                loading1:false,
+                loading2:false,
+                loading3:false,
+                loading4:false,
+                loading5:false,
+                loading6:false,
                 intTabIndex:-1,//初始化显示哪个tab,71我关注的人，72关注我的人
                 page:{
                     pageIndex:1,
@@ -193,7 +200,30 @@
                     aid:this.pageId, //指定用户的动态，
                     hidden:this.pageId == this.userInfo.aid?'':false,//是否隐藏，不指定，查询全部
                 }
+                if(this.activeName == '1') {
+                    this.loading1 = true;
+                } else if(this.activeName == '2') {
+                    this.loading2 = true;
+                } else if(this.activeName == '3') {
+                    this.loading3 = true;
+                } else  if(this.activeName == '4') {
+                    this.loading4 = true;
+                } else if(this.activeName == '5') {
+                    this.loading5 = true;
+                } else if(this.activeName == '6') {
+                    this.loading6 = true;
+                } else {
+                    this.loading = true;
+                }
+                // this.loading = true;
                 apiStat.userDynamicList(data).then(res=>{
+                    this.loading = false;
+                    this.loading1 = false;
+                    this.loading2 = false;
+                    this.loading3 = false;
+                    this.loading4 = false;
+                    this.loading5 = false;
+                    this.loading6 = false;
                    if(res.status == 200) {
                     this.page.count = res.result.count;
                     let ids = res.result.list.map(item=>item.contentId);
diff --git a/src/views/medal/Index.vue b/src/views/medal/Index.vue
index 13126339..85433ba1 100644
--- a/src/views/medal/Index.vue
+++ b/src/views/medal/Index.vue
@@ -47,7 +47,7 @@
             <el-table  :data="rules"   style="width: 100%;height:200px;overflow-y: auto;">
                 <el-table-column prop="name" angin="center" label="勋章" width="80">
                     <template slot-scope="scope">
-                        <img style="width:40px;height:40px" :src="`${webBaseUrl}/images/medal.png`" alt="" srcset="">
+                        <img style="width:40px;height:40px" :src="baseUrl+medal.medalIcon" alt="" srcset="">
                         <!-- <medal-img class="table-medal" style="width:46px;height:52px" :item="medal"></medal-img> -->
                     </template>
                 </el-table-column>
@@ -70,7 +70,7 @@
            </span>
            <div style="text-align: center;"><img :src="`${webBaseUrl}/images/login_medal.png`" width="206px" height="269px" alt=""></div>
            <div style="text-align: left;padding:20px 60px 100px 60px">
-             <div class="jntext1">感谢有你 一路相伴</div>
+             <div class="jntext1">感谢有您 一路相伴</div>
              <div class="jntext2">勋章领取条件:</div>
              <div class="jntext3">2022年11月4日-11月19日登录过平台学习的校友</div>
            </div>
diff --git a/src/views/portal/follow/index.vue b/src/views/portal/follow/index.vue
index e22d7d03..4c4035ea 100644
--- a/src/views/portal/follow/index.vue
+++ b/src/views/portal/follow/index.vue
@@ -13,7 +13,7 @@
                 </div>
                 -->
                 <el-tabs v-model="activeName" @tab-click="handleClick">
-                    <el-tab-pane name="" label="全部">
+                    <el-tab-pane name="" label="全部" v-loading="loading">
                         <template v-for="item in allPageList">
                             <course-list v-if="item.contentType == 1" :list="[item]" :isDynamic="true" :personal="true" :isFollow="true"  @hideIndex="dynamicHide"></course-list>
                             <case-list v-if="item.contentType == 3" :list="[item]" :isDynamic="true" :personal="true" :isFollow="true"  @hideIndex="dynamicHide"></case-list>
@@ -22,27 +22,27 @@
                             <answer-list v-if="item.contentType == 5" :list="[item]" :isDynamic="true" :personal="true" :isFollow="true"  @hideIndex="dynamicHide"></answer-list>
                             <article-list v-if="item.contentType == 2" :list="[item]" :isDynamic="true" :personal="true" :isFollow="true" @hideIndex="dynamicHide"></article-list>
                         </template>
-                        <div v-if="allPageList.length==0 && loading==1" class="home-no-list">
+                        <div v-if="allPageList.length==0 && !loading" class="home-no-list">
                            <img class="img" :src="`${webBaseUrl}/images/homeWu/no-course.png`" alt="" srcset="">
                            <p class="text">暂时没有动态</p>
                         </div>
                     </el-tab-pane>
-                    <el-tab-pane name="1" label="课程">
+                    <el-tab-pane name="1" label="课程" v-loading="loading1">
                         <course-list :list="cousrePageList" :isDynamic="true" :personal="true" :isFollow="true"  @hideIndex="dynamicHide"></course-list>
                     </el-tab-pane>
-                    <el-tab-pane name="6" label="笔记">
+                    <el-tab-pane name="6" label="笔记"  v-loading="loading6">
                         <note-list :list="notePageList" :isDynamic="true" :personal="true" :isFollow="true"  @hideIndex="dynamicHide"></note-list>
                     </el-tab-pane>
-                    <el-tab-pane name="3" label="案例">
+                    <el-tab-pane name="3" label="案例"  v-loading="loading3">
                         <case-list :list="casePageList" :isDynamic="true" :personal="true" :isFollow="true"  @hideIndex="dynamicHide"></case-list>
                     </el-tab-pane>
-                    <el-tab-pane name="2" label="文章">
+                    <el-tab-pane name="2" label="文章"  v-loading="loading2">
                         <article-list :list="articlePageList" :isDynamic="true" :personal="true" :isFollow="true"  @hideIndex="dynamicHide"></article-list>
                     </el-tab-pane>
-                    <el-tab-pane name="4" label="提问">
+                    <el-tab-pane name="4" label="提问"  v-loading="loading4">
                         <put-list :list="qaPageList" :isDynamic="true" :personal="true" :isFollow="true"  @hideIndex="dynamicHide"></put-list>
                     </el-tab-pane>
-                    <el-tab-pane name="5" label="回答">
+                    <el-tab-pane name="5" label="回答"  v-loading="loading5">
                         <answer-list :list="answerPageList" :isDynamic="true" :personal="true" :isFollow="true"  @hideIndex="dynamicHide"></answer-list>
                     </el-tab-pane>
 
@@ -101,8 +101,15 @@
         components:{portalHeader,UcHeader,CaseList,CourseList,NoteList,PutList,AnswerList,ArticleList,FollowList,BookList},
         data(){
             return{
+                loading:false,
+                loading1:false,
+                loading2:false,
+                loading3:false,
+                loading4:false,
+                loading5:false,
+                loading6:false,
                 input:'',
-                loading:0,//加载中
+              //  loading:0,//加载中
                 activeName:'first',
                 page:{
                     pageIndex:1,
@@ -174,8 +181,29 @@
                     contentType:this.activeName == 0? '':this.activeName,//内容类型
                     aids:this.followIds // 数组
                 }
+                if(this.activeName == '1') {
+                    this.loading1 = true;
+                } else if(this.activeName == '2') {
+                    this.loading2 = true;
+                } else if(this.activeName == '3') {
+                    this.loading3 = true;
+                } else  if(this.activeName == '4') {
+                    this.loading4 = true;
+                } else if(this.activeName == '5') {
+                    this.loading5 = true;
+                } else if(this.activeName == '6') {
+                    this.loading6 = true;
+                } else {
+                    this.loading = true;
+                }
                 apiStat.userDynamicfollows(data).then(res=>{
-                   this.loading=1;
+                    this.loading = false;
+                    this.loading1 = false;
+                    this.loading2 = false;
+                    this.loading3 = false;
+                    this.loading4 = false;
+                    this.loading5 = false;
+                    this.loading6 = false;
                    if(res.status == 200) {
                     this.page.count = res.result.count;
                     if(res.result.count==0){
diff --git a/src/views/study/Courses.vue b/src/views/study/Courses.vue
index 32a565e4..bd1b01a5 100644
--- a/src/views/study/Courses.vue
+++ b/src/views/study/Courses.vue
@@ -68,8 +68,8 @@
            </el-dropdown>
           </div>
           <span  @click.stop="jumpRouter(item)">
-            <el-button style="margin-top:30px" v-if="item.progress==0" type="primary" size="small">开始学习</el-button>
-            <el-button style="margin-top:30px" v-if="item.progress>0 && item.progress<100" type="primary" size="small">继续学习</el-button>
+            <!-- <el-button style="margin-top:30px" v-if="item.progress==0" type="primary" size="small">开始学习</el-button> -->
+            <el-button style="margin-top:30px" v-if="item.progress<100" type="primary" size="small">继续学习</el-button>
             <el-button style="margin-top:30px" v-if="item.progress==100" type="primary" size="small">回顾</el-button>
           </span>
       </div>
diff --git a/src/views/user/Noteedit.vue b/src/views/user/Noteedit.vue
index b18b58ff..823816d1 100644
--- a/src/views/user/Noteedit.vue
+++ b/src/views/user/Noteedit.vue
@@ -200,13 +200,13 @@ export default {
                   this.timer = null;
                   this.$router.go(-1);
                }
-            } else {
-               this.isShowTip = '当前网络异常，内容已离线保存，请尝试连接网络后重新自动上传！';
+            } 
+          }).catch(()=>{
+            this.isShowTip = '当前网络异常，内容已离线保存，请尝试连接网络后重新自动上传！';
                setTimeout(()=>{
                      this.isShowTip = '';
                   },10000 * 2)
-               sessionStorage.setItem('isShowTip',this.editdata.content);
-            }
+            sessionStorage.setItem('isShowTip',this.editdata.content);
           })
        }
     },