Merge branch 'stat' of https://codeup.aliyun.com/6265f483e4166464dc2f9c14/boeu/portal into stat

src/components/HomePage/caseList.vue

@@ -22,8 +22,9 @@
                           </div>
 
                       </div>
-                      <div style="height:58px;padding-top:18px ">
+                      <div style="height:58px;padding-top:18px;display:flex">
                         <author :avatar="item.authorInfo.avatar" :name="item.authorInfo.name" :info="item.authorInfo.orgInfo" :sex="item.authorInfo.sex" :aid="item.authorInfo.aid"></author>
+                       <div class="sign-text">{{ item.authorInfo.sign }}</div> 
                       </div>
                       <div class="keyword-text clearfix">
                         <div style="color:#2974D6;font-weight: 450;" v-if="item.orgDomain">{{ orgDomainTranslate(item.info.orgDomain) }}</div>
@@ -66,7 +67,7 @@
         components: {
           interactBar,
           // timeShow,
-          author
+          author  
         },
         computed: {
           ...mapGetters(['userInfo','majorTypeMap','orgDomainMap']),
@@ -91,6 +92,7 @@
               }
           },
           mounted() {
+            
           },
       methods:{
         emitHide(id) {
@@ -119,6 +121,12 @@
   </script>
 
   <style lang="scss" scoped>
+    .sign-text{
+      color: #666666;
+      font-size: 14px;
+      line-height: 35px;
+      margin-left: 10px;
+    }
     .clearfix:after{
       content: "020";
       display: block;

src/components/HomePage/courseList.vue

@@ -9,7 +9,8 @@
               <svg-icon style="margin-right: 10px;font-size:22px;padding-top: 4px;" icon-class="eyes"></svg-icon>隐藏
             </span>
           </p>
-            <div style="width:254px">
+          <div style="display:flex;">
+               <div style="width:254px">
                 <course-image width="254px" height="144px" :course="item.info"></course-image>
             </div>
             
@@ -28,6 +29,8 @@
                     <el-button class="btn" type="primary" @click="jumpDetail(item.info)">继续学习</el-button>
                 </div>
             </div>
+          </div>
+           
         </li>
       </ul>
       <div v-else class="home-no-list">
@@ -82,7 +85,6 @@
         padding-top: 32px;
     }
   .data-info{
-    display: flex;
     border-bottom: 1px solid rgba($color: #999999, $alpha: 0.2);
     padding-bottom: 38px;
     margin-bottom: 32px;

src/components/HomePage/followList.vue

@@ -30,6 +30,18 @@
             </div>
         </div>
         <!--分页没有加-->
+          <div style="text-align: center; margin-top:57px;" v-show="page.count > 0">
+            <el-pagination
+            background
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page="page.pageIndex"
+            :page-sizes="[10, 20, 30, 40]"
+            :page-size="page.pageSize"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="page.count">
+            </el-pagination>
+        </div>
     </div>
     <div v-if="showEmpty">
         <img class="img" style="width:186px;height:160px" src="/images/homeWu/no-follow.png" alt="" srcset="">
@@ -60,6 +72,18 @@
             </div>
         </div>
          <!--分页没有加-->
+         <div style="text-align: center; margin-top:57px;" v-show="page.count > 0">
+            <el-pagination
+            background
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page="page.pageIndex"
+            :page-sizes="[10, 20, 30, 40]"
+            :page-size="page.pageSize"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="page.count">
+            </el-pagination>
+        </div>
     </div>
 
   </div>
@@ -102,7 +126,8 @@ import apiUser from "@/api/system/user.js";
             page:{
               pageIndex:1,
               pageSize:10,
-              aid:''
+              aid:'',
+              count:0
             }
           }
       },
@@ -110,10 +135,12 @@ import apiUser from "@/api/system/user.js";
             this.pageId = this.$xpage.getHomeId(this.$route);
       },
     methods:{
+       
       cancel(item) {
         apiFollow.remove(item.followId).then(res=>{
            if(res.status == 200) {
              this.getPage()
+             
            }
         })
       },
@@ -121,26 +148,43 @@ import apiUser from "@/api/system/user.js";
        tagTab(num) {
          this.active = num;
          if(num == 1) {
-           if(this.followList.length==0){
              this.getPage()
-           }
+
+          //  if(this.followList.length==0){
+          //    this.getPage()
+          //  }
 
          } else {
-           if(this.mypageList.length==0){
             this.getMyPage()
-           }
+
+          //  if(this.mypageList.length==0){
+          //   this.getMyPage()
+          //  }
          }
        },
+       handleSizeChange(val) {
+                this.page.pageSize = val;
+                this.page.pageIndex = 1;
+                this.getPage()
+                this.getMyPage()
+            },
+      handleCurrentChange(val) {
+                this.page.pageIndex = val;
+                this.getPage()
+                this.getMyPage()
+          },
        getMyPage() {//关注我的，关注他的
         this.page.aid = this.pageId;
         apiFollow.mypage(this.page).then(res=>{
+             this.page.count = res.result.count;
+
           if(res.status== 200) {
-             this.count = res.result.count;
+             this.page.count = res.result.count;
              res.result.list.forEach(item=>{
               item.userFollow.authorInfo = { aid: "",name: "",orgInfo: "",avatar: "",sex: null ,sign:''}
              })
              this.mypageList = res.result.list;
-             //console.log(this.mypageList,'this.mypageList');
+             console.log(this.mypageList,'this.mypageList');
              this.getUserData(res.result.list);
           }
         })
@@ -148,8 +192,9 @@ import apiUser from "@/api/system/user.js";
        getPage() { //我关注的，他关注的
         this.page.aid = this.pageId;
         apiFollow.page(this.page).then(res=>{
+             this.page.count = res.result.count;
           if(res.status== 200) {
-             this.count = res.result.count;
+             this.page.count = res.result.count;
              res.result.list.forEach(item=>{
               item.authorInfo = { aid: "",name: "",orgInfo: "",avatar: "",sex: null ,sign:''}
              })

src/components/Portal/interactBar.vue

@@ -18,7 +18,8 @@
         <el-tooltip effect="light" content="浏览量" placement="top" :visible-arrow="false" popper-class="text-tooltip">
           <svg-icon style="margin-right: 0;font-size:20px;" icon-class="couseViews"></svg-icon>
         </el-tooltip>
-        <span class="interact-bar-value"> {{ data.views}}</span>
+        <!-- <span class="interact-bar-value"> {{ data.views}}</span> -->
+        <span class="interact-bar-value"> {{ data.studys}}</span>
       </div>
       <div v-if="comments" class="interact-bar-btn" :style="`min-width: ${nodeWidth};`" :class="{cursor:!readonly}">
         <el-tooltip  effect="light" content="评论" placement="left" :visible-arrow="false" popper-class="text-tooltip">
@@ -51,7 +52,7 @@
         <el-tooltip effect="light" content="浏览量" placement="top" :visible-arrow="false" popper-class="text-tooltip">
           <svg-icon style="margin-right: 0;font-size:22px;padding-top: 4px;" icon-class="eyes"></svg-icon>
         </el-tooltip>
-        <span class="interact-bar-value"> {{ data.views}}</span>
+        <span class="interact-bar-value"> {{ formatNum(data.views)}}</span>
       </div>
     </div>
     <!-- <div v-if="courseExclusive"  @click="addFavorite()" :style="`min-width: ${nodeWidth};`" class="interact-bar-btn" :class="{cursor:!readonly}">
@@ -90,6 +91,7 @@
   import apiUser from '@/api/system/user.js'
   import apiMessage from '@/api/system/message.js'
   import { mapGetters } from 'vuex';
+  import { formatUserNumber } from '@/utils/tools.js';
 export default {
   props: {
     data:{
@@ -169,6 +171,7 @@ export default {
   },
   data(){
     return {
+      formatNum:formatUserNumber,
       loading:false,
       isPraise:false,
       isFavorite:false,

src/components/UserCenter/menu.vue

@@ -306,7 +306,7 @@
           <span slot="title">消息中心</span>
         </el-menu-item>
        
-        <!-- <el-submenu index="myArticle" v-show="curIdentity == 1">
+        <!-- <el-submenu index="myArwticle" v-show="curIdentity == 1">
 		  <template slot="title">
 		    <i class="el-icon-s-grid"></i>
 		    <span>我的文章</span>

src/views/Index.vue

@@ -341,7 +341,7 @@
             <!--内容列表内容-->
             <div  @click="jumpRouter(qa)" class="xindex-qa" v-for="qa in qaList.list" :key="qa.id">
               <div class="qa-card boe-qa-index" >
-                <p class="qa-top"><span>{{qa.views}}正在关注</span><span>{{ qa.sysCreateTime.substring(0, 10) }}</span></p>
+                <p class="qa-top"><span>{{formatNum(qa.views)}}正在关注</span><span>{{ qa.sysCreateTime.substring(0, 10) }}</span></p>
                 <div class="qa-center">
                   <p class="one-line-ellipsis portal-index-title" style="color:#181818;">{{ qa.title }}</p>
                   <p class="boe-qa-sum two-line-ellipsis" style="color:#6E7B84;">{{ qa.content }}</p>

src/views/homepage/page.vue

@@ -50,7 +50,7 @@
                 <span slot="label"><svg-icon icon-class="home-book" style="font-size: 30px;"></svg-icon><span class="tabs-info">书籍</span></span>
                 <book-list></book-list>
             </el-tab-pane> -->
-        </el-tabs>
+        </el-tabs>     
         <div style="text-align: center; margin-top:57px;" v-show="page.count > 0">
             <el-pagination
             background
@@ -470,7 +470,8 @@
             handleClick() {
                 if(this.activeName == '7') {
                     this.$refs.followList.getPage();
-                    this.page.count = 0;
+                    console.log(this.$refs.followList,'llllmj')
+                    this.page.count = this.$refs.followList.count;
                    return
                 }
                 if(this.activeName == '8') {

src/views/portal/case/Index.vue

@@ -111,7 +111,10 @@
               <div class="pagination-div">
                 <span class="pag-text" @click="loadMore()" v-if="moreState == 1">加载更多</span>
                 <span class="pag-text-msg" v-else-if="moreState == 2">数据加载中</span>
-                <span class="pag-text-msg" v-else-if="moreState == 3 && !isSeach">没有更多数据了</span>
+                <span class="notcoures" v-else-if="moreState == 3 && !isSeach">
+                   <img src="../../../../public/images/nocase.png" alt="">
+                  <h5>暂无案例，请优先学习其它案例吧～</h5>
+                  </span>
                 <span class="pag-text-msg" v-else-if="isSeach">没有查询到相关内容</span>
               </div>
               <div v-if="isSeach" style="height:382px">
@@ -716,6 +719,18 @@ export default {
 </script>
 
 <style scoped lang="scss">
+.notcoures{
+  text-align: center;
+  img{
+    width: 360px;
+    height: 226px;
+  }
+  h5{
+    font-size: 14px;
+    color: #333333;
+    font-weight: 400;
+  }
+}
 .orgaicon{
   width: 22px;
   height: 22px;

src/views/portal/course/Index.vue

@@ -112,7 +112,10 @@
           <div class="pagination-div">
             <span class="pag-text" @click="loadMore()" v-if="moreState == 1 && courseList.length>=course.pageSize">加载更多</span>
             <span class="pag-text-msg" v-else-if="moreState == 2">数据加载中</span>
-            <span class="pag-text-msg" v-else-if="moreState == 3">没有更多数据了</span>
+            <span class="notcoures" v-else-if="moreState == 3">
+              <img src="../../../../public/images/nocouresimg.png" alt="">
+              <h5>暂无课程，请优先学习其它课程吧～</h5>
+            </span>
           </div>
         </div>
         <div class="xcontent2-minor">
@@ -858,6 +861,18 @@ export default {
 </script>
 
 <style scoped lang="scss">
+.notcoures{
+  text-align: center;
+  img{
+    width: 360px;
+    height: 226px;
+  }
+  h5{
+    font-size: 14px;
+    color: #333333;
+    font-weight: 400;
+  }
+}
 
   .course-type-left {
         position: absolute;

src/views/user/Mynotes.vue

@@ -765,7 +765,7 @@ export default {
 }
 .note-tab{
     height: 40px;
-    margin-top: 20px;
+    margin-top: 40px;
     border-bottom: 1px solid #ddd;
 }
 .el-buttons{

src/views/user/Noteedit.vue

@@ -26,7 +26,7 @@
          <div class="edit-footer">
             <el-radio-group  v-if="editdata.openType == 9" v-model="editdata.openType"><el-radio :label="9">公开</el-radio><el-radio :label="1">私密</el-radio></el-radio-group>
             <el-radio-group  v-if="editdata.openType == 1" v-model="editdata.openType"><el-radio :label="1">私密</el-radio></el-radio-group>
-            <el-button style="margin-right:40%" type="primary" @click="savedata">保存</el-button>
+            <el-button style="margin-right:40%;box-shadow: 1px 8px 15px 1px rgba(56,125,247,0.18);" type="primary" @click="savedata">保存</el-button>
             <el-button  @click="comeback">取消</el-button>
          </div>
       </div>
@@ -172,7 +172,8 @@ export default {
                   this.notedetail()
                   this.$message({
                   message: '笔记保存成功',
-                  type: 'success'
+                  type: 'success',
+                  center: true
                });
                }
             } else {