Merge remote-tracking branch 'origin/stat' into stat

src/api/system/organiza.js

@@ -21,8 +21,14 @@ const treeList = function (query) {
 const listByParent = function (parentId) {
     return ajax.get('/xboe/org/list-by-parent?parentId='+parentId);
 }
-export default {
+
-    treeList,
+const getSimple = function (id) {
-    listByParent
+    return ajax.get('/xboe/org/simple?id='+id);
+}
+
+export default {
+    treeList,
+    listByParent,
+    getSimple
 }
 

src/assets/styles/ellipsis.scss

@@ -18,7 +18,7 @@
   overflow: hidden;
   text-overflow:ellipsis;
   -webkit-box-orient: vertical;
-  -webkit-line-clamp: 2;
+  -webkit-line-clamp:2;
 }
 .index-one-line-ellipsis{
   display: -webkit-box;

src/assets/styles/portal.scss

@@ -2,7 +2,11 @@
  * 门户页面的一些通用样式定义在这里面
  */
 body {margin: 0px;padding: 0px;}
-
+//定义全局的核心区域宽度
+.xcontent{
+  min-width: 1100px;
+  margin: 0px auto;
+}
 //[文章，案例，问答]详细页面内容部分
 .xpage-detail-content{
   padding: 50px;
@@ -24,6 +28,35 @@ body {margin: 0px;padding: 0px;}
     color:#3d3d3d;
   }
 }
+//课程详细页面banner部分
+ .xpage-coures-banner{
+     width: 100%;
+     height: 200px;
+     background-image: url('../../../public/images/couresdetail.png');
+     background-size: cover;
+     .bcourse-title{
+       color: #fff;
+       margin-top: 20px;
+       font-size: 20px;
+     }
+     .bcourse-score{
+       margin-left: 30px;
+       font-size: 16px;
+     }
+     .banner-crumbs{
+        color: #fff;
+        margin-top:40px;
+        .crumbs-first{
+          font-size: 16px;
+        }
+        .crumbs-line{
+          margin: 0px 10px;
+        }
+        .crumbs-last{
+          font-size: 18px;
+        }
+     }
+ }
 
 //原样式，未修改
 .portal-model-btn{// 写文章，发课程等按钮
@@ -56,9 +89,33 @@ body {margin: 0px;padding: 0px;}
     .ranking-data{
       min-height: 246px;
       margin: 0px;
-      // overflow-y: auto;
+      overflow-y: auto;
     }
 }
+
+.portal-ranking-list{
+  border-radius: 8px;
+  padding: 30px;
+  // height: 544px;
+  // overflow-y: auto;
+  .ranking-title{
+    font-size: 24px;
+    font-family: FZLTCHJW--GB1-0, FZLTCHJW--GB1;
+    font-weight: 600;
+    color: #000000;
+    line-height: 28px;
+    padding-bottom:12px
+  }
+  .ranking-data{
+    min-height: 246px;
+    margin: 0px;
+    // overflow-y: auto;
+  }
+}
+
+
+
+
 //排行块的背景
 .ranking-bg{
   background: url('/images/qa-box.png') no-repeat top left;
@@ -180,18 +237,13 @@ body {margin: 0px;padding: 0px;}
     user-select: none;
   }
   .course-info { //图片下面的一行信息
-    // margin: 5px 15px;
-    // padding-bottom: 10px;
     display: flex;
     justify-content: space-between;
     line-height: 30px;
     .course-info-user{
       font-size: 14px;
       color: #6E7B84;
-      width: 60%;
+      flex: 1;
-      .course-info-author{
-
-      }
       .course-info-studys {
         margin-left: 12px;
         -moz-user-select: none; /*火狐*/
@@ -203,7 +255,7 @@ body {margin: 0px;padding: 0px;}
     }
     .course-info-score{
       display:flex;
-      width: 40%;
+      margin-left: auto;
       ::v-deep .cor-praises {
           // position: absolute;
           -moz-user-select: none; /*火狐*/
@@ -250,30 +302,45 @@ body {margin: 0px;padding: 0px;}
 }
 //以下是多分辨率的控制，注意，只是一些样式的高度，宽度，大小控制，非大小控制不要在这里写
 @media screen and (max-width: 1366px){
+  .xcontent{width: 1100px;}
   .xcontent2{
     width: 1100px;
-    padding: 20px 5px;
+  }
+  .rankimg{
+    width:66px;
+    height:38px;
+    float: left;
   }
   .xcontent2-minor{
-    width: 234px;
+    width: 260px;
   }
   .portal-ranking{
-    padding: 30px 15px;
+    padding: 20px 15px;
+    .ranking-title{
+      font-size: 18px;
+      line-height: 25px;
+      padding-bottom:10px
+    }
   }
   .course-card {
     padding:20px;
     margin-right: 20px;
     .course-image-box {
-      width: 200px;
+      width: 100%;
       height: 114px;
     }
   }
 }
 
 @media screen and (max-width: 1680px) and (min-width:1367px){
+  .xcontent{width: 1366px;}
   .xcontent2{
     width: 1366px;
-    padding: 30px 20px;
+  }
+  .rankimg{
+    width:76px;
+    height:42px;
+    float: left;
   }
   .xcontent2-minor{
     width: 300px;
@@ -292,14 +359,18 @@ body {margin: 0px;padding: 0px;}
 }
 
 @media screen and (max-width: 1920px) and (min-width: 1681px){
+  .xcontent{width: 1690px;}
   .xcontent2{
-    width: 1640px;
+    width: 1690px;
-    padding: 30px 26px;
+  }
+  .rankimg{
+    width:86px;
+    height:42px;
+    float: left;
   }
   .xcontent2-minor{
     width: 400px;
   }
-
   .portal-ranking{
       padding: 30px 30px;
   }
@@ -307,16 +378,21 @@ body {margin: 0px;padding: 0px;}
     padding:25px;
     margin-right: 25px;
     .course-image-box {
-      width: 320px;
+      width: 100%;
       height: 180px;
     }
   }
 }
 
 @media screen and (min-width: 1921px){
+  .xcontent{width: 1880px;}
   .xcontent2{
     width: 1880px;
-    padding: 30px 26px;
+  }
+  .rankimg{
+    width:96px;
+    height:52px;
+    float: left;
   }
   .xcontent2-minor{
     width: 400px;

src/assets/styles/uc.scss

@@ -1,6 +1,7 @@
 /**
  * 用户中心的一些通用样式，定义在这里面
  */
+
  .uc-center-page{
     font-size: 18px;
     font-weight: 600;

src/components/Course/myNote.vue

@@ -14,7 +14,7 @@
                 </div>
                 <div class="newcote-text">
                     <el-input type="textarea" :autofocus="true" placeholder="好记性不如烂笔头，记录些什么吧～"
-                        v-model="mynoteData.content" maxlength="200" :autosize="{ minRows: 18, maxRows: 20}"
+                        v-model="mynoteData.content" maxlength="200" :autosize="{ minRows: 8, maxRows: 20}"
                         show-word-limit>
                     </el-input>
                 </div>
@@ -66,7 +66,7 @@
                         <span class="sm">{{mynoteData.openType == 1?'公开':'私密'}}</span>
                         <svg-icon style="float:right;font-size:26px;margin-top:16px" icon-class="spot"></svg-icon>
                     </p>
-                    <div class="newcote-content" style="margin-top:10px;height:436px">
+                    <div class="newcote-content" style="margin-top:10px;min-height:236px;height: 100%;">
                         <div class="newcote-time" v-if="mynoteData.playTime != 0">
                             <img src="../../../public/images/coteplay.png" />
                             {{formatSeconds(mynoteData.playTime)}}
@@ -277,11 +277,11 @@ export default {
                             // courseName: '',// 课程名称
                             openType: 9,// 1表不公开 9表完全公开
                         };
-                        
+
                     }, 2000)
                         // 是编辑新增
                         let event = {
-                            key: "PublishNote",//后台的事件key  
+                            key: "PublishNote",//后台的事件key
                             title: '编辑了笔记',//事件的标题
                             parameters: "",//用户自定义参数 name:value,name:value
                             content: "编辑了笔记",//this.mynoteData.content,//事件的内容
@@ -294,7 +294,7 @@ export default {
                         }
                         this.$store.dispatch("userTrigger", event);
                     }
-                  
+
                 }
             })
             }
@@ -306,7 +306,7 @@ export default {
     },
 }
 </script>
-  
+
 <style scoped lang="scss">
 ::v-deep .el-dropdown-menu__item:hover {
     background: #333333;
@@ -329,7 +329,6 @@ export default {
         position: absolute;
         bottom: 0;
         right: 200px;
-
         .box-text {
             padding: 12px 16px;
             width: 252px;
@@ -409,7 +408,7 @@ export default {
         margin: 30px 0px;
         box-sizing: border-box;
         padding: 35px 30px;
-        height: 474px;
+        height: 100%;
         background-color: #F5F5F5;
     }
 
@@ -417,7 +416,7 @@ export default {
         margin: 30px 0px;
         box-sizing: border-box;
         padding: 8px 30px;
-        height: 550px;
+        min-height: 300px;
         overflow-y: auto;
         background-color: #fff;
 
@@ -436,7 +435,7 @@ export default {
             font-size: 14px;
             padding-bottom: 20px;
 
-           
+
 
             .more {
                 margin-top: 12px;
@@ -474,4 +473,3 @@ export default {
 
 }
 </style>
-  

src/components/HomePage/homePage.vue

@@ -15,7 +15,7 @@
   
            <div class="user-content">
               <div class="content-top">
-                <h6 content-bottom><router-link to="/homePage"> {{userData.data.name}}</router-link>
+                <h6 content-bottom><router-link to="/home/index"> {{userData.data.name}}</router-link>
                  </h6>
                  <div class="grade">
                      <div>{{userData.level}}</div>
@@ -23,7 +23,7 @@
                  </div>
                  <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" v-if="isFollowHas">已关注</el-button>
-                 <el-button round plain class="btn-user" size="small"><router-link :to="'/homePage/leavingMessage?id='+pageId">去留言</router-link></el-button>
+                 <el-button round plain class="btn-user" size="small"><router-link :to="'/home/leaving?id='+pageId">去留言</router-link></el-button>
               </div>
               <div class="content-bottom">
                 <p class="portal-summary-text">{{userData.data.sign}}</p>

src/components/Portal/authorImg.vue

@@ -56,7 +56,7 @@
     methods:{
       toHome() {
         // ,query:{id:item.objId || item.id}
-        this.$router.push({path:'/homePage?id='+this.aid})
+        this.$router.push({path:'/home/index?id='+this.aid})
       }
     },
     watch:{

src/components/Portal/authorInfo.vue

@@ -73,7 +73,7 @@ import { userAvatarText } from "@/utils/tools.js";
     methods:{
       toHome() {
         // ,query:{id:item.objId || item.id}
-        this.$router.push({path:'/homePage?id='+this.aid})
+        this.$router.push({path:'/home/index?id='+this.aid})
       }
     },
     watch:{

src/components/Portal/comments.vue

@@ -59,7 +59,7 @@
 
           </div>
           <div style="width: 90px;display: flex;justify-content: flex-end;">
-            <el-button @click="submit()" style="height: 52px;" type="primary">发布</el-button>
+            <el-button class="publish-button" @click="submit()" style="height: 30px;" type="primary">发布</el-button>
           </div>
         </div>
       </div>
@@ -793,6 +793,11 @@
 </script>
 
 <style lang="scss" scoped>
+.publish-button{
+  // line-height: 30px;
+  padding-top: 7px;
+  margin-top: 22px;
+}
 .anzhu{
   font-size: 14px;
   color: #999;

src/components/Portal/guideBox.vue

@@ -2,7 +2,7 @@
 	<el-dialog
       :close-on-click-modal="false"
       :visible.sync="guideCollection"
-      :append-to-body="true" 
+      :append-to-body="true"
       top="90px"
       width="900px">
       <div class="gui-box">
@@ -20,8 +20,8 @@
                     <img class="banner-img" style=" margin: 0 auto;" :src="fileBaseUrl + item.img" alt="">
                 </swiper-slide>
                 <div class="swiper-pagination" slot="pagination"></div>
-              </swiper>   
+              </swiper>
-            </div> 
+            </div>
             <p class="gui-text">{{description}}</p>
             <el-button type="primary" class="btn-one" @click="goHome()">进入首页</el-button>
          </div>
@@ -65,22 +65,25 @@
                 navigation: {
                 nextEl: '.swiper-button-next',
                 prevEl: '.swiper-button-prev',
-                }, 
+                },
             },
     	}
     },
     created() {
+        //这里必须放在当前的Session存储中，不能每次都调用
         apiGuide.hasUser().then(res=>{
            if(res.result) {
-            this.guideCollection = true;
-           } else {
             this.guideCollection = false;
+           } else {
+            this.guideCollection = true;
+            //只是在显示时才调用
+            this.getlist();
            }
-        })
+        });
-        this.getlist();
+       
     },
     mounted() {
-   
+
     },
     methods:{
         goHome() {
@@ -94,14 +97,14 @@
                 }
             })
         },
-        
+
         showImg(item) {
           this.resonimg = [];
           if(item){
             this.description = item.description;
             this.resonimg = item.images;
           }
-           
+
         //    this.swiper.update();
         },
         notYet() {
@@ -110,7 +113,7 @@
         },
     },
     watch:{
-    
+
     },
     computed:{
         swiper() {
@@ -135,7 +138,7 @@
             right:-136px;
             top:45px;
         }
-        
+
         ::v-deep .swiper-wrapper{
             padding-bottom: 60px;
         }
@@ -213,7 +216,7 @@
         }
     }
 	::v-deep .el-dialog{
-        // background: #fff url('/images/homeWu/interest.png') no-repeat; 
+        // background: #fff url('/images/homeWu/interest.png') no-repeat;
         border-radius: 10px;
         .el-dialog__header{
             display: none;

src/components/Portal/noteComment.vue

@@ -11,7 +11,7 @@
         <!--列表内容-->
         <div class="comments-items" v-show="listShow">
             <!--一个评论-->
-            <div class="zan-wu" v-if="list.length == 0">暂无评论～</div>
+            <div class="zan-wu" v-if="list.length == 0">暂无公开笔记～</div>
             <div class="comment" v-for="(com,comIdx) in list" :key="com.id">
                  <div class="comment-top">
                     <div class="comment-author">

src/components/PortalHeader.vue

@@ -1,31 +1,35 @@
 <template>
   <div class="portal-header">
-    <div class="portal-top">
+    <div class="portal-top" :style="{color:textColor}">
         <div class="portal-top-left">
           <div class="portal-top-logo">
-            <img src="../assets/logo/logo.png" v-if="current == 'qa'" style="width:160px;height: 27px;" />
+            <img src="../assets/logo/logo-white.png" v-if="textColor == '#fff' || textColor == '#ffffff'" style="width:160px;height: 27px;" />
-            <img src="../assets/logo/logo2.png" v-else style="width:160px;height: 27px;" />
+            <img src="../assets/logo/logo.png" v-else style="width:160px;height: 27px;" />
           </div>
           <div class="portal-top-nav">
-            <div class="top-nav" :class="current == 'index' ? 'current-nav' : ''">
+            <div class="top-nav" :style="{color:textColor}" :class="current == 'index' ? activeNav : ''">
-              <router-link to="/index">首页
+              <router-link to="/index" >首页
-              <div :class="current == 'index' ? 'nav-bottbor' : ''"></div>
+                <div :class="current == 'index' ? 'nav-bottbor' : ''"></div>
-            </router-link></div>
+              </router-link>
-            <div class="top-nav" :class="current == 'course' ? 'current-nav' : ''">
+            </div>
+            <div class="top-nav" :style="{color:textColor}" :class="current == 'course' ? activeNav : ''">
               <router-link to="/course">课程
-              <div :class="current == 'course' ? 'nav-bottbor' : ''"></div>
+                <div :class="current == 'course' ? 'nav-bottbor' : ''"></div>
-              </router-link></div>
+              </router-link>
-            <div class="top-nav" :class="current == 'article' ? 'current-nav' : ''">
+            </div>
+            <div class="top-nav" :style="{color:textColor}" :class="current == 'article' ? activeNav : ''">
               <router-link to="/article">文章
-              <div :class="current == 'article' ? 'nav-bottbor' : ''"></div>
+                <div :class="current == 'article' ? 'nav-bottbor' : ''"></div>
-              </router-link></div>
+              </router-link>
-            <div class="top-nav" :class="current == 'qa' ? 'current-nav' : ''">
+            </div>
-              <router-link to="/qa">问答
+            <div class="top-nav" :style="{color:textColor}" :class="current == 'qa' ? activeNav : ''">
-              <div :class="current == 'qa' ? 'nav-bottbor' : ''"></div>
+              <router-link to="/qa" >问答
-              </router-link></div>
+                <div :class="current == 'qa' ? 'nav-bottbor' : ''"></div>
+              </router-link>
+            </div>
             <div class="top-nav">
               <el-dropdown placement="bottom" @command="handleCommand">
-                <span class="el-dropdown-link" style="font-size:16px;cursor: pointer;">专区</span>
+                <span class="el-dropdown-link" style="font-size:16px;cursor: pointer;" :style="{color:textColor}">专区</span>
                 <el-dropdown-menu slot="dropdown">
                   <el-dropdown-item command="one">BOE系列公开课</el-dropdown-item>
                   <el-dropdown-item command="two" divided>Grow180</el-dropdown-item>
@@ -35,12 +39,16 @@
                 </el-dropdown-menu>
               </el-dropdown>
             </div>
-            <div class="top-nav" :class="current == 'case' ? 'current-nav' : ''"><router-link to="/case">推荐案例
+            <div class="top-nav" :style="{color:textColor}" :class="current == 'case' ? activeNav : ''">
-            <div :class="current == 'case' ? 'nav-bottbor' : ''"></div>
+              <router-link to="/case">推荐案例
-            </router-link></div>
+                  <div :class="current == 'case' ? 'nav-bottbor' : ''"></div>
-            <div class="top-nav" :class="current == 'follow' ? 'current-nav' : ''"><router-link to="/follow">我的关注
+              </router-link>
-            <div :class="current == 'follow' ? 'nav-bottbor' : ''"></div>
+            </div>
-            </router-link></div>
+            <div class="top-nav" :style="{color:textColor}" :class="current == 'follow' ? activeNav : ''">
+              <router-link to="/follow">我的关注
+                <div :class="current == 'follow' ? 'nav-bottbor' : ''"></div>
+              </router-link>
+            </div>
           </div>
         </div>
         <div class="portal-top-right">
@@ -75,8 +83,8 @@
             <div class="person-action-item">
                 <el-dropdown class="person-action-index">
                   <span class="el-dropdown-link">
-                    <span v-if="current == 'qa'" style="color: #333;">学员</span>
+                    <span :style="{color:textColor}">学员</span>
-                    <span v-else style="color: #fff;">学员</span><i class="el-icon-arrow-down el-icon--right"></i>
+                    <i class="el-icon-arrow-down el-icon--right"></i>
                   </span>
                   <el-dropdown-menu slot="dropdown">
                     <el-dropdown-item><router-link to="/index">学员</router-link></el-dropdown-item>
@@ -87,7 +95,7 @@
              </div>
              <div class="person-action-item">
                 <el-dropdown>
-                  <div class="el-dropdown-link" style="display:flex">
+                  <div class="el-dropdown-link" style="display:flex" :style="{color:textColor}">
                     <div class="person-action-index">
                       <div v-if="userInfo.avatar !== '' " class="user-avatar">
                           <img :src="userInfo.avatar"  style="width: 30px;height: 30px;"/>
@@ -97,21 +105,21 @@
                           <div v-else><img src="../../public/images/Avatarwoman.png" alt=""></div>
                       </div>
                     </div>
-                    <div v-if="current == 'qa'" style="color:#333333 ;font-size: 14px;font-weight: 600;margin-top: 10px;">{{userInfo.name}}</div>
+                    <div v-if="current == 'qa'" style="font-size: 14px;font-weight: 600;margin-top: 10px;">{{userInfo.name}}</div>
-                    <div v-else style="color:#fff;font-size: 14px;font-weight: 600;margin-top: 10px;">{{userInfo.name}}</div>
+                    <div v-else style="font-size: 14px;font-weight: 600;margin-top: 10px;">{{userInfo.name}}</div>
                   </div>
                   <el-dropdown-menu slot="dropdown">
                     <el-dropdown-item @click.native="setCurIdentity(1)"><a :href="`${webBaseUrl}${isTiao ? '/uc/study/task' : '/uc/study/courses'}`">个人中心</a></el-dropdown-item>
-                    <el-dropdown-item><router-link :to="'/homePage?id='+userInfo.aid">个人主页</router-link></el-dropdown-item>
+                    <el-dropdown-item><router-link :to="'/home/index?id='+userInfo.aid">个人主页</router-link></el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
             </div>
             <div class="person-action-item">
-              <div v-if="current == 'qa'" class="person-action-index" style="color:#333333" @click="logout()">
+              <div v-if="current == 'qa'" class="person-action-index" :style="{color:textColor}" @click="logout()">
                 <svg-icon  style="margin-right: 4px;font-size:22px;" icon-class="black-out"></svg-icon>登出
               </div>
-              <div v-else class="person-action-index" style="color:#fff" @click="logout()">
+              <div v-else class="person-action-index" :style="{color:textColor}" @click="logout()">
-                <svg-icon  style="margin-right: 4px;font-size:22px;color: #333333;" icon-class="white-out"></svg-icon>登出
+                <svg-icon  style="margin-right: 4px;font-size:22px;" icon-class="white-out"></svg-icon>登出
               </div>
             </div>
           </div>
@@ -127,9 +135,7 @@ import apiMessage from '@/api/system/message.js';
 import apiBoeCourse from '@/api/boe/course.js';
 import InterestCollection from '@/components/Portal/interestCollection.vue'
 import GuideBox from '@/components/Portal/guideBox.vue'
-import {
+import {userAvatarText} from "@/utils/tools.js";
-  userAvatarText
-} from "@/utils/tools.js";
 export default {
   props: {
     current: {
@@ -140,6 +146,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    textColor:{
+      type: String,
+      default: '',
+    },
     goSearch:{
       type: Number,
       default: 0,
@@ -151,6 +161,12 @@ export default {
 
     avatarText(){
       return userAvatarText(this.userInfo.name);
+    },
+    activeNav(){
+        return {
+          'top-nav-active-blue': this.textColor=='#000000',
+          'top-nav-active-white': this.textColor=='#fff' || this.textColor=='#ffffff',
+        }
     }
   },
   data() {
@@ -290,6 +306,33 @@ export default {
 </script>
 
 <style scoped rel="stylesheet/scss" lang="scss">
+.top-nav-active-blue{
+    color: #387DF7;
+    a{color:#387DF7;}
+    div{
+      width: 75%;
+      height: 4px;
+      top: 75%;
+      left: 13%;
+      background: #387DF7;
+      border-radius: 5px;
+      position: absolute;
+    }
+}
+.top-nav-active-white{
+    color: #fff;
+    a{color:#fff;}
+    div{
+      width: 75%;
+      height: 4px;
+      top: 75%;
+      left: 13%;
+      background: #fff;
+      border-radius: 5px;
+      position: absolute;
+    }
+}
+
 .sear-but{
   position: absolute;
   bottom: 10%;

src/components/UcHeader/Index.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="uc-header xcontent">
+  <div class="uc-header">
-    <div class="header-box" >
+    <div class="uc-header-box" >
       <div class="personalData">
          <!-- <div >
            <img src="../../../public/images/Avatarwoman.png" alt="">
@@ -8,8 +8,10 @@
           <div class="uesr-avaer">
           <img :src="userInfo.avatar" v-if="userInfo.avatar !== '' ">
           <div v-else class="uavatar">
+            <router-link :to="'/home/index?id='+userInfo.aid">
               <div v-if="sex === 1 "><img src="../../../public/images/Avatarman.png" alt=""></div>
               <div v-else><img src="../../../public/images/Avatarwoman.png" alt=""></div>
+            </router-link>
           </div>
            </div>
 
@@ -48,7 +50,7 @@
            <div class="learning-an"><span>{{uinfo.monthTotal}}</span>h</div>
         </div>
         <div class="learning-border" ></div>
-         <div class="learning-info" style="margin-left:22px">
+         <div class="learning-info">
            <div class="learning-qus">当月学习天数</div>
            <div class="learning-an"><span>{{uinfo.monthDay}}</span>天</div>
         </div>
@@ -57,62 +59,14 @@
            <div class="learning-an"><span>{{uinfo.monthTotalDay}}</span>天</div>
         </div>
          <div class="learning-border" ></div>
-         <div class="learning-info" style="margin-left:22px">
+         <div class="learning-info">
            <div class="learning-qus">我的U币（累计）</div>
            <div class="learning-an"><span>{{uinfo.uCurrency}}</span></div>
         </div>
-        <div @click="jumrank" class="list">
+        <div class="learning-info">
-          BOE 排行榜 >>
+            <div @click="jumrank" style="cursor: pointer;" class="ranking-link"> BOE 排行榜 >></div>
         </div>
       </div>
-      <!-- <div style="display: flex;justify-content: flex-start;">
-       
-        
-        <div style="padding-left: 15px;">
-          <div style="height: 38px;padding-left: 5px;">
-              <span style="font-size: 20px;font-weight: 500;color: #333;">{{userInfo.name}}</span>
-              <span style="padding-left: 10px;color: #888888;font-size: 12px;cursor: pointer;">
-                <el-link @click="toPage('/user/Setting')" icon="el-icon-setting" type="info" :underline="false">个人设置</el-link>
-              </span>
-          </div>
-          <div style="height: 35px;padding-left: 5px;color:#7a7a7a;">
-            <span style="color: #7a7a7a;padding-right: 15px;" v-if="orgInfo">{{orgInfo}}</span>
-            目前海没有实时更新的策略，暂未处理
-            <span>学习时长：{{userInfo.studyTotalH}}小时</span>
-          </div>
-          <div>
-            <router-link to="/study/index"><span :class="{identity:true,active:curIdentity==1}" @click="setCurIdentity(1)">学员</span></router-link>
-            <router-link to="/teacher/index"><span v-if="identity == 2 || identity == 5" :class="{identity:true,active:curIdentity==2}" @click="setCurIdentity(2)">教师</span></router-link>
-            <router-link to="/manager/index"><span v-if="identity == 3 || identity == 5" :class="{identity:true,active:curIdentity==3}" @click="setCurIdentity(3)">管理员</span></router-link>
-          </div>
-        </div>
-      </div> -->
-      <!-- <div style="display: flex;justify-content: flex-end;padding-top: 35px;"> -->
-        <!-- q1没有课程表，所以这里先隐藏
-          <div v-if="curIdentity==2" style="padding: 0px 40px 0px 0px;color: #1EA0FA;text-align: center;">
-            <div><i style="font-size: 40px;" class="el-icon-date"></i> <br/>授课表</div>
-          </div>
-          -->
-          <!---->
-          <!-- <div>
-            <div tabindex="1" class="upicon" @click="toPage('/user/myshare')">
-              <i  class="el-icon-share"></i>
-              <div>我分享的</div>
-            </div>
-          </div>
-          <div>
-            <div tabindex="2" class="upicon" @click="toPage('/user/toshare')">
-              <i  class="el-icon-s-promotion"></i>
-              <div>分享给我的</div>
-            </div>
-          </div>
-          <div>
-            <div tabindex="3" class="upicon" @click="toPage('/user/favorites')">
-              <i  class="el-icon-star-on"></i>
-              <div>我的收藏</div>
-            </div>
-          </div> -->
-      <!-- </div> -->
     </div>
   </div>
 </template>
@@ -184,7 +138,7 @@ import {userAvatarText,cutFullName} from "@/utils/tools.js";
                 this.uinfo.uCurrency = item.total;
               }
             });
-           } 
+           }
         })
       },
       setCurIdentity(iden){
@@ -202,19 +156,19 @@ import {userAvatarText,cutFullName} from "@/utils/tools.js";
 </script>
 
 <style lang="scss" scoped>
-.list{
+.ranking-link{
   font-size: 16px;
   font-weight: 600;
   color: #333333;
   margin-top: 20px;
 }
 .learningData{
-   width: 50%;
   padding-top: 70px;
   box-sizing: border-box;
   margin-left:auto;
   .learning-info{
     float: left;
+    margin-left: 20px;
     margin-right: 22px;
      .learning-qus{
           font-size: 14px;
@@ -254,7 +208,7 @@ import {userAvatarText,cutFullName} from "@/utils/tools.js";
          vertical-align: top;
      }
    }
-  
+
    .medalbutt{
      color: #333333;
      font-size: 14px;
@@ -262,13 +216,11 @@ import {userAvatarText,cutFullName} from "@/utils/tools.js";
     //  float: left;
      margin-top: 6px;
    }
- 
+
 }
 .personalData{
- 
   flex: 1;
   padding-top: 40px;
-  padding-left: 115px;
   box-sizing: border-box;
   display: flex;
   .uesr-avaer{
@@ -330,21 +282,21 @@ import {userAvatarText,cutFullName} from "@/utils/tools.js";
   }
 }
 
-.header-box{
+.uc-header-box{
   display: flex;
   justify-content: space-between;
   height: 210px;
-  background: url('../../../public/images/userbgimg.png') no-repeat;
+  margin: 0 auto;
-  background-size:445px 210px;
-   background-position: right 0;
 }
 
  .uc-header{
-   height: 210px;
+    height: 210px;
-   margin: 0 auto;
 
-  background: #fff;
+    background-color: #fff;
-  //  background-color: #c9c2c2;
+    background-image: url('../../../public/images/userbgimg.png') ;
+    background-repeat: no-repeat;
+    background-size:445px 210px;
+    background-position: right 0;
  }
  .upicon{
    text-align: center;
@@ -386,8 +338,8 @@ import {userAvatarText,cutFullName} from "@/utils/tools.js";
     padding-top: 10px;
      color: #aa0000;
   }
- }
+}
- .uavatar{
+.uavatar{
    border-radius: 50%;
     // border: 1px solid #73adfe;
     // color: #73adfe;
@@ -399,13 +351,139 @@ import {userAvatarText,cutFullName} from "@/utils/tools.js";
     border-radius: 50%;
     // background: #d9e9ff;
     div{
-     border-radius: 50%;
+      border-radius: 50%;
       img{
-     border-radius: 50%;
+        border-radius: 50%;
         width: 100px;
         height: 100px;
-
+      }
+    }
 }
+
+@media screen and (max-width: 1366px){
+  .uc-header-box {
+    width: 1160px;
+  }
+  .learningData{
+    margin-left:auto;
+    .learning-info{
+      margin-left: 10px;
+      margin-right: 10px;
+      .learning-qus{
+        font-size: 12px;
+      }
+      .learning-an{
+        font-size: 12px;
+      }
     }
   }
+  .personalData{
+    .uesr-avaer{
+      margin-right: 10px;
+    }
+    .user-content{
+      .content-top{
+        .grade{
+          div{
+              width: 48px;
+          }
+          span{
+            font-size: 14px;
+          }
+        }
+        h6{
+          font-size: 26px;
+        }
+        span{
+          font-size: 14px;
+          margin-left: 5px;
+          margin-right: 10px;
+        }
+        .editbutt{
+          width: 80px;
+          height: 25px;
+          line-height: 5px;
+          text-align: center;
+          font-size: 12px;
+        }
+      }
+    }
+  }
+  .content-bottom{
+     .medalbutt{
+       margin-right: 20px;
+     }
+
+  }
+}
+@media screen and (max-width: 1680px) and (min-width:1367px){
+  .uc-header-box {
+    width: 1300px;
+  }
+  .learningData{
+    margin-left:auto;
+    .learning-info{
+      margin-left: 10px;
+      margin-right: 12px;
+    }
+  }
+  
+  .personalData{
+    .uesr-avaer{
+      margin-right: 10px;
+    }
+    .user-content{
+      .content-top{
+        .grade{
+          div{
+              width: 48px;
+          }
+          span{
+            font-size: 14px;
+          }
+        }
+        h6{
+          font-size: 26px;
+        }
+        span{
+          font-size: 14px;
+          margin-left: 5px;
+          margin-right: 15px;
+        }
+        .editbutt{
+          width: 80px;
+          height: 25px;
+          line-height: 5px;
+          text-align: center;
+          font-size: 12px;
+        }
+      }
+    }
+  }
+}
+@media screen and (max-width: 1920px) and (min-width: 1681px){
+  .uc-header-box {
+    width: 1600px;
+  }
+  .learningData{
+    margin-left:auto;
+    .learning-info{
+      margin-left: 20px;
+      margin-right: 22px;
+    }
+  }
+}
+
+@media screen and (min-width: 1921px){
+  .uc-header-box {
+    width: 1800px;
+  }
+  .learningData{
+    margin-left:auto;
+    .learning-info{
+      margin-left: 30px;
+      margin-right: 30px;
+    }
+  }
+}
 </style>

src/layout/components/AppMain.vue

@@ -1,12 +1,12 @@
 <template>
-  <section class="app-main xcontent">
+  <section class="app-main xuc-content">
     <div style="display: flex;">
-      <div style="height: 100%;width: 227px;">
+      <div style="height: 100%;width: 210px;">
         <uc-menu></uc-menu>
         <!-- <div style="height: 20px;"></div> -->
       </div>
       <!-- width: 990px; -->
-      <div class="main-body" style="padding: 30px 30px;flex:1; background-color: #fff;margin-left: 32px;">
+      <div class="main-body" style="padding: 30px 20px;flex:1; background-color: #fff;margin-left: 32px;">
         <!-- <div style="margin-bottom: 10px;padding:10px; border-bottom: 1px solid #dbdbdb;"> -->
           <!-- <el-breadcrumb separator-class="el-icon-arrow-right">
             <el-breadcrumb-item :to="{ path: '/uc/index' }"><i class="el-icon-arrow-right"></i>个人中心</el-breadcrumb-item>
@@ -60,7 +60,7 @@ export default {
   //width: 1500px;
   // width: 1000px;
   // margin: 0 auto;
-  padding-top: 10px;
+  padding-top: 20px;
   position: relative;
   overflow: hidden;
 }
@@ -98,6 +98,30 @@ export default {
   display: block;
   margin: 5px 10px;
 }
+.xuc-content{
+  margin: 0px auto;
+}
+@media screen and (max-width: 1366px){
+  .xuc-content {
+    width: 1100px;
+  }
+}
+@media screen and (max-width: 1680px) and (min-width:1367px){
+  .xuc-content {
+    width: 1300px;
+  }
+}
+@media screen and (max-width: 1920px) and (min-width: 1681px){
+  .xuc-content {
+    width: 1600px;
+  }
+}
+
+@media screen and (min-width: 1921px){
+  .xuc-content {
+    width: 1800px;
+  }
+}
 </style>
 
 <style lang="scss">

src/layout/components/TopNav/Index.vue

@@ -4,7 +4,7 @@
       <div class="xtop-content">
       <div class="xtop-left">
         <div class="xtop-logo">
-          <router-link class="routerLink" to="/index"><img src="../../../assets/logo/logo2.png" style="width:240px;height: 41px;" /></router-link>
+          <router-link class="routerLink" to="/index"><img src="../../../assets/logo/logo-white.png" style="width:161px;height:27px;" /></router-link>
         </div>
         <div class="xtop-nav">
           <div class="xtop-nav-item"><a :href="`${webBaseUrl}/index`">首页</a></div>
@@ -46,7 +46,8 @@
               </el-link>
             </el-badge>
           </div>
-          <el-dropdown class="person-action-index" style="margin-left: 44px;">
+          <div>
+            <el-dropdown class="person-action-index" style="margin-left: 44px;">
               <span class="el-dropdown-link">
                  <span v-if="current == 'qa'" style="color: #333;">学员</span>
                 <span v-else style="color: #fff;">学员</span><i class="el-icon-arrow-down el-icon--right"></i>
@@ -58,7 +59,19 @@
                 <el-dropdown-item v-if="identity == 3 || identity == 5" @click.native="setCurIdentity(3)"><router-link to="/course/manage">管理员</router-link></el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
-          <div style="margin-left: 50px;color: #fff;"><el-avatar :src="userInfo.avatar" style="vertical-align: middle;width:40px;height:40px;margin-right:10px;"></el-avatar>{{userInfo.name}}</div>
+          </div>
+          <div>
+            <el-dropdown>
+                <div style="margin-left: 50px;color: #fff;font-size: 14px;cursor: pointer;">
+                  <el-avatar :src="userInfo.avatar" style="vertical-align: middle;width:40px;height:40px;margin-right:10px;"></el-avatar>{{userInfo.name}}
+                </div>
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item @click.native="setCurIdentity(1)"><a :href="`${webBaseUrl}${isTiao ? '/uc/study/task' : '/uc/study/courses'}`">个人中心</a></el-dropdown-item>
+                  <el-dropdown-item><router-link :to="'/home/index?id='+userInfo.aid">个人主页</router-link></el-dropdown-item>
+                </el-dropdown-menu>
+            </el-dropdown>
+          </div>
+
           <!-- <div style="margin-left: 5px;">
             <el-dropdown @command="handleUcCommand">
               <span class="el-dropdown-link">
@@ -69,9 +82,9 @@
               </el-dropdown-menu>
             </el-dropdown>
           </div> -->
-		  <div class="person-action">
+        <div class="person-action">
-		    <el-button @click="logout()" type="text"><svg-icon  style="margin-right: 4px;font-size:22px;color: #000;" icon-class="white-out"></svg-icon>登出</el-button>
+          <el-button @click="logout()" type="text"><svg-icon  style="margin-right: 4px;font-size:22px;color: #000;" icon-class="white-out"></svg-icon>登出</el-button>
-		  </div>
+        </div>
       </div>
       </div>
     </div>
@@ -99,7 +112,7 @@
            </map>
         </div>
     </el-dialog>
-   
+
   </div>
 </template>
 

src/router/index.js

@@ -150,21 +150,21 @@ export const constantRoutes = [{
     meta: { title: '我的消息', icon: 'dashboard', noCache: true, affix: false },
 },
 {
-    path: '/homePage',
+    path: '/home',
     hidden: true,
     component: (resolve) => require(['@/views/homepage/Index'], resolve),
     name: 'homePage',
-    redirect: '/homePage/page',
+    redirect: '/home/index',
     meta: { title: '主页', icon: 'dashboard', noCache: true, affix: false },
     children: [{
-        path: 'page',
+        path: 'index',
         hidden: true,
         component: (resolve) => require(['@/views/homepage/page'], resolve),
         name: 'page',
         meta: { title: '主页', icon: 'dashboard', noCache: true, affix: true }
     },
     {
-        path: 'leavingMessage',
+        path: 'leaving',
         hidden: true,
         component: (resolve) => require(['@/views/homepage/leavingMessage'], resolve),
         name: 'leavingMessage',

src/views/portal/article/Detail.vue

@@ -1,9 +1,9 @@
 <template>
   <div id="article-index">
     <div class="article-banner">
-    <portal-header current="article" :goSearch="3"></portal-header>
+    <portal-header current="article" textColor="#ffffff" :goSearch="3"></portal-header>
     </div>
-    <div>
+    <div style="padding-top:30px">
       <div class="xcontent2">
          <div class="xcontent2-main" style="margin-right: 30px;" >
           <div  v-if="noData" >
@@ -290,7 +290,7 @@ export default {
     background: url('/images/article-banner.png');
   }
 .course-resources{
-  width: 410px;
+ 
   margin-top: 26px;
   img{
     width: 100%;

src/views/portal/article/Index.vue

@@ -1,10 +1,10 @@
 2<template>
   <div id="article-list-content" class="article-list-content">
     <div class="article-banner">
-      <portal-header current="article" @emitInput="emitInput"></portal-header>
+      <portal-header current="article" textColor="#ffffff" @emitInput="emitInput"></portal-header>
     </div>
     <!--内容区域-->
-    <div class="">
+    <div style="padding-top:30px" class="">
       <div class="xcontent2">
         <div class="xcontent2-main" style="margin-right: 30px;background-color: #fff;padding-top: 50px;">
           <div>
@@ -80,13 +80,13 @@
                  <ul class="ranking-data">
                       <li v-for="(item, index) in ankingList" :key="index" style="margin-top:30px;line-height: 22px;cursor: pointer;">
                         <span class="portal-right-text orange-one" v-if="index==0" style="margin-right:94px">
-                          <img src="/images/list-01.png" alt="">
+                          <img src="/images/listblue01.png" alt="">
                         </span>
                         <span class="portal-right-text orange-tow" v-if="index==1" style="margin-right:94px">
-                            <img src="/images/list02.png" alt="">
+                            <img src="/images/listblue02.png" alt="">
                         </span>
                         <span class="portal-right-text orange-three" v-if="index==2" style="margin-right:94px">
-                            <img src="/images/list03.png" alt="">
+                            <img src="/images/listblue03.png" alt="">
                         </span>
                         <span class="portal-right-text" v-if="index==3" style="margin-right:94px">
                              <img src="/images/list04.png" alt="">

src/views/portal/case/Detail.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="case-list-content">
-    <div class="case-banner">
+    <div style="margin-bottom:30px" class="case-banner">
-      <portal-header current="case" :goSearch="2"></portal-header>
+      <portal-header current="case" textColor="#fff" :goSearch="2"></portal-header>
     </div>
     <div class="">
        <div class="xcontent2">
@@ -96,7 +96,7 @@
               <el-empty :image-size="200"></el-empty>
             </div>
           </div>
-          <div :class="zoomShow?'':'xcontent2-minor'">
+          <div class="xcontent2-minor" :style="{display:zoomShow? '':'none'}">
             <div>
             <div id="fixd-box">
             <div class="portal-ranking ranking-bg">
@@ -524,7 +524,6 @@ export default {
     background: url('/images/case-banner.png');
   }
 .course-resources{
-  width: 410px;
   margin-top: 26px;
   img{
     width: 100%;

src/views/portal/case/Index.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="case-list-content">
     <div class="case-banner">
-      <portal-header current="case" @emitInput="emitInput"></portal-header>
+      <portal-header current="case" textColor="#fff" @emitInput="emitInput"></portal-header>
     </div>
     <div class="xcontent2">
       <div class="xcontent2-main" style="margin-right: 30px;">
@@ -100,7 +100,7 @@
                       </div>
                       <div style="display: flex;justify-content: flex-end;">
                        <div style="margin:8px 0;">
-                          <interactBar :type="0" :shares="false"  :data="item" :readonly="true"></interactBar> </div>
+                          <interactBar :type="0" :shares="false"  :data="item" :readonly="true" :views="false"></interactBar> </div>
                       </div>
                     </div>
                   </div>
@@ -709,7 +709,6 @@ export default {
 
 <style scoped lang="scss">
 .course-resources{
-  width: 410px;
   margin-top: 26px;
   img{
     width: 100%;

src/views/portal/course/Detail.vue

@@ -1,67 +1,70 @@
 <template>
   <div>
-    <portal-header current="course" :goSearch="1"></portal-header>
+    <div class="xpage-coures-banner">
-    <div  class="portal-content xcontent">
+        <portal-header current="course" textColor="#fff" :goSearch="1"></portal-header>
-      <el-breadcrumb separator-class="el-icon-arrow-right" class="breadcrumb-nav">
+        <div class="xcontent">
-        <el-breadcrumb-item :to="{ path: '/course' }">课程列表</el-breadcrumb-item>
+            <div class="banner-crumbs">
-        <el-breadcrumb-item>课程详情</el-breadcrumb-item>
+               <router-link to="/course"><span class="crumbs-first">课程列表</span></router-link>
-      </el-breadcrumb>
+               <span class="crumbs-line">  &gt; </span>
-      <!-- <div class="course-title">
+               <span class="crumbs-last">课程详情</span>
-        <div class="title">{{courseInfo.name}}</div>
+            </div>
-        <div class="course-title-right">
+            <div class="bcourse-title">
-          <interactBar :readonly="!stuStusts || stuStusts==0" :type="1" :data="courseInfo" :comments="false" :views="false"></interactBar>
+               <!-- <span>{{courseInfo.name}}</span> -->
+                <!-- <span>{{courseInfo.summary}}</span>  -->
+                <!-- <span class="bcourse-score">{{toScore(courseInfo.score)}}分</span> -->
+            </div>
         </div>
-      </div> -->
+    </div>
-      <el-row :gutter="10">
-        <el-col :span="24">
-          <el-card :body-style="{ padding: '0px' }">
-            <div class="detail">
-              <div class="image">
-                <course-image :course="courseInfo"></course-image>
-              </div>
-              <div class="detail-info">
-              <div class="course-title">
-                <div class="title"> {{courseInfo.name}}</div>
-                <interactBar :readonly="!stuStusts || stuStusts==0" :type="1" :data="courseInfo" :praises="false" :comments="false" :views="false"></interactBar>
-              </div>
-                  <!-- <div class="course-title-right"> -->
-                  <!-- <interactBar :readonly="!stuStusts || stuStusts==0" :type="1" :data="courseInfo" :comments="false" :views="false"></interactBar> -->
-                <!-- </div> -->
-                <div>
-                  <div class="study-count">{{courseInfo.studys}}人学习</div>
-                  <!-- <div><span style="font-size:20px;color:#ff8e00">{{courseInfo.score ? courseInfo.score.toFixed(1) : 0}}</span><span style="font-size:12px;color:#ff8e00">分</span></div> -->
-                </div>
-                <div class="label-div">
-                  <el-tag class="label-item" effect="plain" v-for="(item,tagIdx) in tagArray" :key="tagIdx">{{item}}</el-tag>
-                 </div>
-                <!-- <div style="width:160px;height:50px"> -->
-                <!-- </div> -->
-                <!-- <div class="label-div">
-                  <el-tag class="label-item" effect="plain">{{courseType(courseInfo.type)}}</el-tag>
-                </div> -->
-                  <div class="score-div">
-                     <!-- colors="[#FF8E00]" -->
-                    <div v-if="courseInfo.score">
-                      <el-rate disabled v-model="courseInfo.score"></el-rate>
-                      <span class="score-text">{{courseInfo.score ? courseInfo.score.toFixed(1) : 0}}<span style="font-size: 14px;">分</span></span>
-                     </div>
-                     <div v-else class="score-no">未评分</div>
-                  </div>
-                  <div class="btn-div"  style="height:30px;margin-top: 15px;">
-                    <el-button v-if="stuStusts == 0" type="primary" @click="startSigningUp()" >立即报名</el-button>
-                    <el-button v-if="stuStusts == 1" type="primary" @click="jumpJearning">{{btnName}}</el-button>
-                 </div>
 
-                <div class="erweima" v-if="courseInfo.device == 2 || courseInfo.device == 3">
+    <div  class="portal-content xcontent">
-                  <img class="detail-img" v-show="!showQrcode" @click="showQrcode = true" src="../../../assets/images/qr.png">
+
-                  <div v-show="showQrcode" class="qrcode" @click="showQrcode = false">
+          <div class="detail">
-                    <div id="qrcode" ref="qrcode"></div>
+            <div class="image">
-                    <!-- <div class="qrcode-title">手机扫码观看</div> -->
+              <course-image :course="courseInfo"></course-image>
-                  </div>
+            </div>
+            <div class="detail-info">
+            <div class="course-title">
+              <div class="title"> {{courseInfo.name}}</div>
+              <interactBar :readonly="!stuStusts || stuStusts==0" :type="1" :data="courseInfo" :praises="false" :comments="false" :views="false"></interactBar>
+            </div>
+                <!-- <div class="course-title-right"> -->
+                <!-- <interactBar :readonly="!stuStusts || stuStusts==0" :type="1" :data="courseInfo" :comments="false" :views="false"></interactBar> -->
+              <!-- </div> -->
+              <div>
+                <div class="study-count">{{courseInfo.studys}}人学习</div>
+                <!-- <div><span style="font-size:20px;color:#ff8e00">{{courseInfo.score ? courseInfo.score.toFixed(1) : 0}}</span><span style="font-size:12px;color:#ff8e00">分</span></div> -->
+              </div>
+              <div class="label-div">
+                <el-tag class="label-item" effect="plain" v-for="(item,tagIdx) in tagArray" :key="tagIdx">{{item}}</el-tag>
+               </div>
+              <!-- <div style="width:160px;height:50px"> -->
+              <!-- </div> -->
+              <!-- <div class="label-div">
+                <el-tag class="label-item" effect="plain">{{courseType(courseInfo.type)}}</el-tag>
+              </div> -->
+                <div class="score-div">
+                   <!-- colors="[#FF8E00]" -->
+                  <div v-if="courseInfo.score">
+                    <el-rate disabled v-model="courseInfo.score"></el-rate>
+                    <span class="score-text">{{courseInfo.score ? courseInfo.score.toFixed(1) : 0}}<span style="font-size: 14px;">分</span></span>
+                   </div>
+                   <div v-else class="score-no">未评分</div>
+                </div>
+                <div class="btn-div"  style="height:30px;margin-top: 15px;">
+                  <el-button v-if="stuStusts == 0" type="primary" @click="startSigningUp()" >立即报名</el-button>
+                  <el-button v-if="stuStusts == 1" type="primary" @click="jumpJearning">{{btnName}}</el-button>
+               </div>
+
+              <div class="erweima" v-if="courseInfo.device == 2 || courseInfo.device == 3">
+                <img class="detail-img" v-show="!showQrcode" @click="showQrcode = true" src="../../../assets/images/qr.png">
+                <div v-show="showQrcode" class="qrcode" @click="showQrcode = false">
+                  <div id="qrcode" ref="qrcode"></div>
+                  <!-- <div class="qrcode-title">手机扫码观看</div> -->
                 </div>
               </div>
             </div>
-          </el-card>
+          </div>
+
           <el-row :gutter="10">
             <el-col :span="18">
               <el-card :body-style="{ padding: '0px' }" class="info" style="margin-top: 10px;">
@@ -121,8 +124,7 @@
               </el-card>
             </el-col>
           </el-row>
-        </el-col>
+
-      </el-row>
     </div>
     <portal-footer></portal-footer>
   </div>
@@ -220,10 +222,10 @@ export default {
               })
               this.catalogTree=treeList;
           }
-          
+
-         
+
-        
+
-        
+
         this.showQrimage();
         this.isSignUp();
       }else{
@@ -411,6 +413,8 @@ export default {
 
 .detail {
   display: flex;
+  margin-top: 20px;
+  background-color: #fff;
   .image {
       width: 500px;
       height: 280px;

src/views/portal/course/Index.vue

@@ -1,9 +1,9 @@
 <template>
   <div id="couser-list-content" class="couser-list-content">
     <div class="course-banner">
-      <portal-header current="course" @emitInput="emitInput"></portal-header>
+      <portal-header current="course" textColor="#fff" @emitInput="emitInput"></portal-header>
     </div>
-    <div class="">
+    <div style="padding-top:30px" class="">
       <div class="xcontent2">
         <div class="xcontent2-main content-div">
           <div class="search-div" style="margin-right:36px">
@@ -83,6 +83,7 @@
                 <a :href="toCourseDetail(cinfo)">
                   <div class="course-image-box">
                     <course-image :course="cinfo"></course-image>
+                  <span v-if="cinfo.type == 20 || 10" class="course-type-left">录播课</span>
                   </div>
                   <div class="course-title two-line-ellipsis" :title="cinfo.title"   v-html="cinfo.name"></div>
                   <div class="course-info">
@@ -121,7 +122,7 @@
                       上传课程
                 </div>
               </div>
-              <div class="portal-ranking ranking-bg">
+              <div class="portal-ranking-list ranking-bg">
                 <div class="ranking-title">好评榜</div>
                 <ul class="ranking-data">
                    <li class="list-info" v-for="(item, index) in scorelist" :key="index" style="cursor: pointer;margin-top:24px;line-height: 30px;display: flex;">
@@ -142,14 +143,15 @@
                         </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 style="width:96px;height:52px" :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>
 
                       <div class="list-active">
                          <div class="list-content">
                            <div class="list-img">
-                            <course-image :course="item"></course-image>
+                            <!-- <course-image :course="item"></course-image> -->
+                           <img style="width:96px;height:52px" :src="fileBaseUrl + item.images" alt=""/>
                             <span v-if="item.type < 21" class="course-type">录播</span>
                             <span v-if="item.type==30" class="course-type">线下课</span>
                             <span v-if="item.type==40" class="course-type">学习项目</span>
@@ -166,7 +168,7 @@
                    </li>
                 </ul>
               </div>
-              <div style="margin-top:26px" class="portal-ranking ranking-bg1">
+              <div style="margin-top:26px" class="portal-ranking-list ranking-bg1">
                 <div class="ranking-title">人气榜</div>
                 <ul class="ranking-data">
                    <li class="list-info" v-for="(item, index) in ankingList" :key="index" style="cursor: pointer;margin-top:24px;line-height: 30px;display: flex;">
@@ -187,14 +189,15 @@
                         </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 style="width:96px;height:52px" :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>
 
                         <div class="list-active">
                          <div class="list-content">
                            <div class="list-img">
-                            <course-image :course="item"></course-image>
+                            <!-- <course-image :course="item"></course-image> -->
+                           <img style="width:96px;height:52px" :src="fileBaseUrl + item.images" alt=""/>
                             <span v-if="item.type < 21" class="course-type">录播</span>
                             <span v-if="item.type==30" class="course-type">线下课</span>
                             <span v-if="item.type==40" class="course-type">学习项目</span>
@@ -211,7 +214,7 @@
                    </li>
                 </ul>
               </div>
-              <div style="margin-top:26px" class="portal-ranking ranking-bg2">
+              <div style="margin-top:26px" class="portal-ranking-list ranking-bg2">
                 <div class="ranking-title">热度榜</div>
                 <ul class="ranking-data">
                    <li class="list-info" v-for="(item, index) in hotList" :key="index" style="cursor: pointer;margin-top:24px;line-height: 30px;display: flex;">
@@ -231,14 +234,15 @@
                              <img src="/images/list05.png" alt="">
                         </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 span" v-else style="font-size: 14px;">
+                        <span class="portal-title-desc " v-else style="font-size: 14px;">
-                          <img style="width:96px;height:52px" :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">
                          <div class="list-content">
                            <div class="list-img">
-                            <course-image :course="item"></course-image>
+                            <!-- <course-image :course="item"></course-image> -->
+                           <img style="width:96px;height:52px" :src="fileBaseUrl + item.images" alt=""/>
                             <span v-if="item.type < 21" class="course-type">录播</span>
                             <span v-if="item.type==30" class="course-type">线下课</span>
                             <span v-if="item.type==40" class="course-type">学习项目</span>
@@ -430,11 +434,10 @@ export default {
     couresreso(){
       let key = 'course';
       apiPlace.detail(key).then(res=>{
-        console.log(res)
+        console.log(res,'lmj')
-        let lmj =  JSON.parse(res.result.content)
+        let Imageres =  JSON.parse(res.result.content);
-        // console.log(lmj)
+        this.resonimg = Imageres[0]
-        this.resonimg = lmj[0]
+        // console.log(this.resonimg,'111')
-        console.log(this.resonimg.image)
       })
     },
     jumUX() {
@@ -452,6 +455,7 @@ export default {
         .clientHeight;
       let outerHeight = document.documentElement.clientHeight;
       let scrollTop = document.documentElement.scrollTop;
+      let outerWidth = document.querySelector(".xcontent2-minor").clientWidth;
       if (outerHeight + scrollTop + 350 >= innerHeight) {
         if (this.moreState == 1 && this.course.pageIndex < 4) {
           this.loadMore();
@@ -459,7 +463,7 @@ export default {
       }
       if (scrollTop > 830) {
         document.querySelector("#fixd-box").style.cssText =
-          "position: fixed;top: -914px;";
+          "position: fixed;top: -914px;width:"+outerWidth+"px";
       } else {
         document.querySelector("#fixd-box").style.cssText = "position: static";
       }
@@ -833,12 +837,34 @@ export default {
 </script>
 
 <style scoped lang="scss">
+  
+  .course-type-left {
+        position: absolute;
+        top: 0px;
+        right: 0px;
+        width: 60px;
+        height: 24px;
+        line-height: 24px;
+        text-align: center;
+        background-color: #f99000;
+        border-radius: 2px 4px 2px 14px;
+        font-size: 12px;
+        color: #ffffff;
+        -moz-user-select: none;
+        /*火狐*/
+        -webkit-user-select: none;
+        /*webkit浏览器*/
+        -ms-user-select: none;
+        /*IE10*/
+        -khtml-user-select: none;
+        /*早期浏览器*/
+        user-select: none;
+      }
   .list-lidex{
     display: inline-block;
     display: flex;
   }
 .course-resources{
-  width: 410px;
   margin-top: 24px;
 
   img{
@@ -892,13 +918,13 @@ export default {
       .course-type{
         position: absolute;
         left: 0;
-        bottom: 0;
+        bottom: 26%;
         height: 20;
         line-height: 20px;
         font-size: 12px;
         color: #FFFFFF;
         padding: 0px 8px;
-        background: #387DF7;
+        background: #387DF7 ;
         border-radius: 0px 12px 0px 0px;
       }
     }

src/views/portal/course/Micro.vue

@@ -1,13 +1,21 @@
 <template>
   <div>
-    <portal-header current="course" :goSearch="1"></portal-header>
+    <div class="xpage-coures-banner">
+        <portal-header current="course" textColor="#fff" :goSearch="1"></portal-header>
+        <div class="xcontent">
+            <div class="banner-crumbs">
+               <router-link to="/course"><span class="crumbs-first">课程列表</span></router-link>
+               <span class="crumbs-line">  &gt; </span>
+               <span class="crumbs-last">课程详情</span>
+            </div>
+            <div class="bcourse-title">
+               <!-- <span>{{courseInfo.name}}</span> -->
+                <!-- <span>{{courseInfo.summary}}</span>  -->
+                <!-- <span class="bcourse-score">{{toScore(courseInfo.score)}}分</span> -->
+            </div>
+        </div>
+    </div>
     <div class="portal-content xcontent">
-      <el-breadcrumb separator-class="el-icon-arrow-right" class="breadcrumb-nav">
-        <el-breadcrumb-item :to="{ path: '/course' }">课程列表</el-breadcrumb-item>
-        <el-breadcrumb-item>课程详情</el-breadcrumb-item>
-      </el-breadcrumb>
-      <el-row :gutter="10">
-        <el-col :span="24">
           <el-card :body-style="{ padding: '0px', 'min-height': '500px' }">
             <el-row class="detail">
               <el-col :span="18">
@@ -217,8 +225,7 @@
               </el-card>
             </el-col>
           </el-row>
-        </el-col>
+        
-      </el-row>
     </div>
     <portal-footer></portal-footer>
   </div>

src/views/portal/follow/index.vue

@@ -1,6 +1,8 @@
 <template>
     <div class="follow-page">
-        <top></top>
+        <div class="follow-banner">
+          <portal-header current="follow" textColor="#fff" @emitInput="emitInput"></portal-header>
+        </div>
         <div>
             <div class="home-page-left">
                 <div class="book-input">
@@ -52,9 +54,9 @@
 
     </div>
   </template>
-  
+
   <script>
-    import top from '../../../layout/components/TopNav/Index.vue'
+    import portalHeader from "@/components/PortalHeader.vue";
     import UcHeader from '@/components/HomePage/homePage.vue'
     import CaseList from '@/components/HomePage/caseList.vue'
     import CourseList from '@/components/HomePage/courseList.vue'
@@ -66,7 +68,7 @@
     import BookList from "@/components/HomePage/bookList.vue"
 
     export default{
-        components:{top,UcHeader,CaseList,CourseList,NoteList,PutList,AnswerList,ArticleList,FollowList,BookList},
+        components:{portalHeader,UcHeader,CaseList,CourseList,NoteList,PutList,AnswerList,ArticleList,FollowList,BookList},
         data(){
             return{
                 input:'',
@@ -80,11 +82,13 @@
        }
       }
   </script>
-  
+
   <style lang="scss" scoped>
+    .follow-banner{
+      background-color: #0078FC;
+    }
      .follow-page{
         background: #FFFFFF;
-        padding-top: 72px;
         height: 100vh;
        ::v-deep .el-tabs__active-bar{
           height: 4px;
@@ -171,7 +175,7 @@
                         color: #666666;
                        }
                     }
-                    
+
                 }
                 .ach-title{
                     font-size: 18px;
@@ -221,4 +225,3 @@
         // }
      }
   </style>
-  

src/views/portal/qa/Answer.vue

@@ -1,9 +1,9 @@
 <template>
   <div id="answer-detail">
     <div class="qa-banner">
-      <portal-header current="qa" :goSearch="4"></portal-header>
+      <portal-header current="qa" textColor="#000000" :goSearch="4"></portal-header>
     </div>
-    <div >
+    <div style="padding-top:30px" >
       <div class="xcontent2">
         <div style="margin-right: 30px;" class="xcontent2-main">
           <div v-if="noData">
@@ -31,7 +31,7 @@
                     </div>
                  </div>
                  <div class="content-inter">
-                   <interactBar v-if="detailData.id" :type="4" :comments="false" :data="detailData" :views="false"> </interactBar>
+                   <interactBar v-if="detailData.id" :type="4" :shares="false" :comments="false"  :data="detailData" :answers="true" :clickAnswer="true"  :views="false"> </interactBar>
                 </div>
 
                </div>
@@ -887,7 +887,6 @@ export default {
     background: url('/images/qa-banner.png');
   }
 .course-resources{
-  width: 410px;
   margin-top: 26px;
   img{
     width: 100%;

src/views/portal/qa/Detail.vue

@@ -3,7 +3,7 @@
      <div class="qa-banner">
       <portal-header current="qa" :goSearch="4"></portal-header>
     </div>
-    <div class="portal-content xcontent" >
+    <div style="padding-top:30px" class="portal-content xcontent" >
       <div class="xrow" style="display: flex;justify-content: space-between;">
          <div style="flex: 1;" class="xcol content-div">
 
@@ -743,7 +743,7 @@ export default {
     background: url('/images/qa-banner.png');
   }
 .course-resources{
-  width: 410px;
+  // width: 410px;
   img{
     width: 100%;
     height: 100%;

src/views/portal/qa/Index.vue

@@ -1,10 +1,10 @@
 <template>
   <div id="qa-list-content" class="qa-list-content">
     <div class="qa-banner">
-      <portal-header current="qa" class="qa-nav" @emitInput="emitInput"></portal-header>
+      <portal-header current="qa" textColor="#000000" class="qa-nav" @emitInput="emitInput"></portal-header>
     </div>
 
-    <div class="portal-content">
+    <div style="padding-top:30px" class="portal-content">
 
       <div  class="xcontent2">
         <div  class="xcontent2-main" style="margin-right: 30px;background-color: #fff;padding-top: 50px;">
@@ -55,7 +55,7 @@
                         <div style="width: 120px;">
                           <author :avatar="qa.authorInfo.avatar" :name="qa.authorInfo.name" :sex="qa.authorInfo.sex"></author>
                         </div>
-                        <div><interactBar nodeWidth="60px" :readonly="true"  :type="4" :data="qa" @addAnswers="qaAnswer(qa)" :shares="true" :comments="false" :answers="true" :clickAnswer="true" :views="false"></interactBar></div>
+                        <div><interactBar nodeWidth="60px" :readonly="true"  :type="4" :data="qa" @addAnswers="qaAnswer(qa)" :shares="false" :comments="false" :answers="true" :clickAnswer="true" :views="false"></interactBar></div>
                       </div>
                     </div>
                   </div>
@@ -85,13 +85,13 @@
                         <ul class="ranking-data">
                           <li v-for="(item, index) in ankingList" :key="index" style="margin-top:30px;line-height: 22px;cursor: pointer;">
                         <span class="portal-right-text orange-one" v-if="index==0" style="margin-right:94px">
-                          <img src="/images/list-01.png" alt="">
+                          <img src="/images/listblue01.png" alt="">
                         </span>
                         <span class="portal-right-text orange-tow" v-if="index==1" style="margin-right:94px">
-                            <img src="/images/list02.png" alt="">
+                            <img src="/images/listblue02.png" alt="">
                         </span>
                         <span class="portal-right-text orange-three" v-if="index==2" style="margin-right:94px">
-                            <img src="/images/list03.png" alt="">
+                            <img src="/images/listblue03.png" alt="">
                         </span>
                         <span class="portal-right-text" v-if="index==3" style="margin-right:94px">
                              <img src="/images/list04.png" alt="">
@@ -444,7 +444,6 @@ export default {
   background: #387DF7 !important;
 }
 .course-resources{
-  width: 410px;
   margin-top: 26px;
   img{
     border-radius: 8px;

src/views/ucurrency/Index.vue

@@ -3,7 +3,7 @@
        <div class="myubi">
            <div class="ubi-hear">
                <h6>我的U币:{{uinfo.uCurrency}}</h6><span class="pointer" @click="dialogVisible = true">U币规则 <i class="el-icon-arrow-right"></i> </span>
-                <el-button @click="exportRecord()">导出记录</el-button>
+                <el-button icon="el-icon-document" @click="exportRecord()">导出记录</el-button>
            </div>
            <div style="max-height:600px;overflow-y:auto;padding-right:50px">
                 <div class="Ubi-hist">