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

src/components/Course/collectItem.vue

@@ -79,7 +79,6 @@ export default {
     courseImage
   },
   mounted() {
-    console.log(this.items,'items');
   },
   methods: {
     coudetail(item) {
@@ -104,8 +103,9 @@ export default {
         .catch(() => {});
     },
     contentTypeFilter(value) {
+      let val = Number(value);
       let obj = {};
-      switch (value) {
+      switch (val) {
         case 10: {
           obj.class = 'uc-course-type2';
           obj.text = '录播';

src/components/HomePage/caseList.vue

@@ -28,7 +28,7 @@
                        <div class="sign-text">{{ item.authorInfo.sign }}</div> 
                       </div>
                       <div class="keyword-text clearfix">
-                        <div style="color:#2974D6;font-weight: 450;" v-if="item.info.orgDomain">{{ orgDomainTranslate(item.info.orgDomain) }}</div>
+                        <div style="color:#2974D6;font-weight: 450;" v-if="orgDomainTranslate(item.info.orgDomain)">{{ orgDomainTranslate(item.info.orgDomain) }}</div>
                         <div style="color:#2974D6;font-weight: 450;" v-if="item.info.orgDomain == '' && item.info.orgDomainParent">{{ orgDomainTranslate(item.info.orgDomainParent) }}</div>
                         <div style="color:#2974D6;font-weight: 450;"  v-for="item,idx in item.info.majorType" :key="idx" >{{ majorTypeTranslate(item) }}</div>
                         <div v-if="item.info.keyword1">{{ item.info.keyword1 }}</div>
@@ -119,7 +119,6 @@
         },
         orgDomainTranslate(code){ // 组织领域翻译
           if(code==''){return '';}
-          console.log(code,'code');
           return this.orgDomainMap.get(code);
         },
        }

src/components/HomePage/homePage.vue

@@ -119,7 +119,7 @@
           apiFollow.remove(this.pageId).then(res=>{
             if(res.status == 200) {
                this.isFollowHas = false;
-			   this.$message.success("取消关注成功");
+			         this.$message.success("取消关注成功");
             } else {
               this.$message.error(res.message);
             }

src/components/Portal/authorImg.vue

@@ -52,6 +52,7 @@
     },
     mounted() {
       this.userName=this.name;
+      this.usersex = this.sex;
       if(this.avatar){
         if(this.avatar.startsWith('http')){
           this.userAvatar=this.avatar;
@@ -59,7 +60,8 @@
           this.userAvatar=this.baseUrl+this.avatar;
         }
       }
-      this.usersex = this.sex;
+      console.log(this.usersex)
+      
     },
     methods:{
       toHome() {

src/views/Index.vue

@@ -14,8 +14,10 @@
         </swiper>
       </div>
       <div class="personal-panel">
-        <div class="personal-img">
-          <author-img v-if="userInfo.avatar" :avatar="userInfo.avatar" :aid="userInfo.aid" :noJump="false" :sex="userInfo.sex"></author-img>
+        <div class="personal-img">     
+          <author-img width="68px" height="68px" :avatar="userInfo.avatar" :aid="userInfo.aid" :noJump="false" :sex="userInfo.sex"></author-img>
+          {{ userInfo.avatar }}
+
           <!-- {{ userInfo.avatar }} -->
         </div>
         <!-- <img style="width:68px;height:68px" src="/images/Avatarman.png" alt=""> -->
@@ -463,7 +465,7 @@
         needHobbyShow:false,//是否显示兴趣爱好
         formatNum:formatUserNumber,
         cutOrgNamePath:cutOrgNamePath,
-        //userInfo: {},
+        // userInfo: {},
         ankingList: [],
         answersList: [],
         Popularity: [],

src/views/homepage/page.vue

@@ -378,6 +378,9 @@
                             res.result.some(con => {
                             if (con.id == item.contentId) {
                                 item.info = con;
+                                if(typeof item.info.majorType == 'string') {
+                                    item.info.majorType = item.info.majorType.split(',');
+                                }
                                 return true;
                             } else {
                                 return false;

src/views/portal/case/Index.vue

@@ -562,7 +562,6 @@ export default {
           if (res.status == 200) {
             if (res.result.list.length > 0) {
               this.isSeach = false;
-              console.log(res.result.list)
               res.result.list.forEach(item => {
                 item.majorType = item.majorType.split(",");
                 item.isAll = false;