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

src/views/Index.vue

@@ -112,33 +112,36 @@
     
       <span class="modules-text">推荐案例</span>
       <span class="quyer-tag">
-      <a :class="caseList.orderType==1?'current':''" @click="changeCaseOrder(1)">最新</a>
       <a :class="caseList.orderType==2?'current':''" @click="changeCaseOrder(2)">最热</a>
+      <a :class="caseList.orderType==1?'current':''" @click="changeCaseOrder(1)">最新</a>
       </span>
       <span class="more"><router-link to="/case">更多&nbsp;></router-link></span>
       </div>
       <div class="modules-list xrow" style="height: 235px;overflow: hidden;">
          <div class="index-course xrow-course" v-for="ca in caseList.list" :key="ca.id">
          <div  class="casetwo" :body-style="{ padding: '0px' }">
-             <div class="case-top"></div>
+             <!-- <div class="case-top"></div> -->
              <div class="case-conent">
                 <div class="case-time">
                     {{ca.sysCreateTime.substring(0,10)}}
                 </div>
+                 <a :href="'case/detail?id='+ca.id" >
                 <span class="case-title one-line-ellipsis">
-                    <a :href="'case/detail?id='+ca.id" target="_blank">{{ca.title}}</a>
+                   {{ca.title}}
                 </span>
                 <div class="case-text three-line-ellipsis">
-                    {{ca.content}}
+                    {{ca.summary}}
                 </div>
+                </a>
                 <div class="case-inter">
                   <interactBar style="width:180px" :type="3" :readonly="true" :data="ca" :shares="false" :views="false"></interactBar>
                    
                 </div>
-             </div>
-          <div style="margin-top:48%;margin-left:20px;height:40px">
+                  <div style="height:40px">
             <authorInfo :avatar="ca.authorInfo.avatar" :name="ca.authorInfo.name" :info="ca.authorInfo.orgInfo" :sex="ca.authorInfo.sex"></authorInfo></div>
          </div>
+             </div>
+        
       </div>
         
       </div>
@@ -629,6 +632,7 @@ export default {
   -webkit-box-orient: vertical;
 }
 .casetwo{
+  border: 1px solid #F0F0F0;
   width: 100%;
   height: 220px;
   margin-bottom:15px;
@@ -639,34 +643,36 @@ export default {
      background-image: linear-gradient(to right , #b8c7e2, #d0dcf3);
   }
   .case-conent{
-    width: 220px;
-    height: 160px;
-    box-shadow: 1px 1px 15px #ccc;
-    position: absolute;
-    top: 5%;
+    width: 100%;
+    height: 100%;
+    // box-shadow: 1px 1px 15px #ccc;
+    // position: absolute;
+    // top: 5%;
     background-color: #fff;
-    left: 4%;
-    padding: 10px;
+    // left: 4%;
+    padding: 16px;
     .case-time{
-      font-size: 10px;
-      color: #b1b1b1;
+      font-size: 12px;
+      color: #999999;
       text-align: right;
     }
     .case-title{
+      margin-top: 10px;
       font-size: 14px;
       color: #333;
       font-weight: bold;
       margin-bottom:10px;
     }
     .case-text{
+      height: 55px;
       font-size: 14px;
     color: #888888;
     line-height: 18px;
     margin-bottom:12px;
     }
     .case-inter{
-      position: absolute;
-      bottom: 5%;
+      width: 100%;
+      border-bottom: 1px solid #f3f3f3;
     }
    
   }

src/views/portal/case/Detail.vue

@@ -13,18 +13,19 @@
           <el-card :body-style="{ padding: '0px' }" class="detail">
             <div class="title">{{ caseDetail.title }}</div>
             <div class="label">
-              <author :onlyAvatar="true" :avatar="authorInfo.avatar" ></author>
+              <author :onlyAvatar="true" :avatar="authorInfo.avatar" :sex="authorInfo.sex" ></author>
               <span>作者：{{ authorInfo.name }}</span>
               <span>工号：{{ authorInfo.code }}</span>
               <span>部门：{{ authorInfo.orgInfo }}</span>
               <!-- <span>案例编号：{{ caseDetail.id }}</span> -->
               <span v-if="caseDetail.sysCreateTime">{{ caseDetail.sysCreateTime.substring(0,10) }}</span>
               <interactBar :views="false" :data="caseDetail" :type="3" :comments="false" :shares="true"></interactBar>
+              
             </div>
-            <div class="btn-div">
-              <span class="item">角色认知</span>
-              <span class="item">角色转变</span>
-              <span class="item">团队管理</span>
+            <div class="case-summary"><span>{{ caseDetail.summary }}</span></div>
+            <div class="btn-div" >
+              <span v-if="caseDetail.orgDomain" class="item">{{ caseDetail.orgDomain }}</span>
+              <span v-if="caseDetail.majorType" class="item">{{ caseDetail.majorType }}</span>
             </div>
           </el-card>
           <el-card :body-style="{ padding: '0px' }" class="jianjie">
@@ -91,7 +92,7 @@
              <div style="height: 10px;"></div>
               <el-card class="ranking-card" >
               <div slot="header">
-                <span style="font-size: 14px;font-weight: 600;color: #333333;">人气榜</span>
+                <span style="font-size: 14px;font-weight: 600;color: #333333;">热度榜</span>
               </div>
               <div style="padding-bottom:10px">
                 <el-row class="ranking-title">
@@ -153,7 +154,7 @@ export default {
         filePath:''
       },
       ankingList:[],
-      authorInfo:{ aid: '', name: '', orgInfo: '', avatar: '', code: '' }
+      authorInfo:{ aid: '', name: '', orgInfo: '', avatar: '', code: '',sex:null}
     };
   },
   mounted() {
@@ -184,7 +185,7 @@ export default {
           }
         }
         if(scrollTop > 630) {
-          document.querySelector('#fixd-box').style.cssText = "position: fixed;top: -400px;width:245.5px";
+          document.querySelector('#fixd-box').style.cssText = "position: fixed;top: -550px;width:245.5px";
         } else {
           document.querySelector('#fixd-box').style.cssText = "position: static";
         }
@@ -264,6 +265,11 @@ export default {
 </script>
 
 <style scoped lang="scss">
+.case-summary{
+  margin-top: 10px;
+  font-size: 16px;
+  color: #333;
+}
 ::v-deep .el-card__body{
   padding: 0;
 }

src/views/portal/case/Index.vue

@@ -22,7 +22,7 @@
                 <el-tag closable>显示事业</el-tag>
                 <el-tag closable>经营</el-tag>
                 <el-tag closable>业绩提升</el-tag>
-                <el-tag closable v-for="(tag, tagIdx) in searchTags" :key="tagIdx">{{ tag.words }}</el-tag>
+                <el-tag closable v-for="(tag, tagIdx) in searchTags" :key="tagIdx" @close="tagsClose(tag,tagIdx)">{{ tag.words }}</el-tag>
               </div>
             </div>
               <el-row class="search-item">
@@ -56,7 +56,7 @@
                     <span class="item-title" style="padding-right: 5px;">专业分类</span>
                     <span class="item-line"></span>
                      </div>
-                     <div style="flex:1" id="searchBox"> 
+                     <div style="flex:1;" id="searchBox" > 
                         <el-radio-group v-model="type2" size="mini" @change="search()">
                       <el-radio-button label="0">全部</el-radio-button>
                       <el-radio-button v-for="item in Profess" :key="item.code" :label="item.code" > {{ item.name }} </el-radio-button>
@@ -96,7 +96,7 @@
                   </el-col>
                 </el-row> -->
               </div>
-              <div class="searBox">
+              <div class="searBox" v-if="searchwd">
                  <el-button type="text"  id="closeSearchBtn" @click="closeSearch">
                       {{word}}
                      <i :class="showAll ? 'el-icon-arrow-up ': 'el-icon-arrow-down'"></i>
@@ -138,7 +138,7 @@
                     <router-link :to="'/case/detail?id='+item.id">
                     <div class="case-info-summary" >
                       
-                              {{item.content}}
+                              {{item.summary}}
 
                     </div>
                      </router-link>
@@ -212,7 +212,7 @@
              <div style="height: 10px;"></div>
               <el-card class="ranking-card" >
               <div slot="header">
-                <span style="font-size: 14px;font-weight: 600;color: #333333;">人气榜</span>
+                <span style="font-size: 14px;font-weight: 600;color: #333333;">热度榜</span>
               </div>
               <div style="padding-bottom:10px">
                 <el-row class="ranking-title">
@@ -294,7 +294,8 @@ export default {
   },
   data() {
     return {
-       showAll:true,//是否展开全部
+      searchwd:true,
+      showAll:true,//是否展开全部
       searchRecords:[],
       caseList:{
         count:0,
@@ -360,15 +361,27 @@ export default {
     window.removeEventListener("scroll",this.handleScroll);
   },
   methods: {
+   
+   tagsClose(tag, index){
+
+   },
+
 
     closeSearch() {
       this.showAll = !this.showAll;
       var searchBoxHeght = document.getElementById("searchBox");
+      var searchBoxWidth = document.getElementById("searchBox");
+      // console.log(searchBoxWidth.clientWidth);
+      if(searchBoxWidth.clientWidth > 950){
+       this.searchwd = false;
+      }
       if (this.showAll == false) {
         searchBoxHeght.style.height = 70 + "px";
       } else {
         searchBoxHeght.style.height = "auto";
       }
+
+
     },
 
   getAnkingData(){
@@ -396,7 +409,6 @@ export default {
       })
     },
 
-
     getdomain(){
      let key ='org_domain'
       apiDict.items(key).then(res =>{
@@ -410,7 +422,6 @@ export default {
      let key ='major_type'
       apiDict.items(key).then(res =>{
         if(res.status==200){
-          console.log(res)
           this.Profess = res.result
         }
       })
@@ -433,7 +444,7 @@ export default {
           }
         }
         if(scrollTop > 630) {
-          document.querySelector('#fixd-box').style.cssText = "position: fixed;top: -400px;width:245.5px";
+          document.querySelector('#fixd-box').style.cssText = "position: fixed;top: -550px;width:245.5px";
         } else {
           document.querySelector('#fixd-box').style.cssText = "position: static";
         }
@@ -609,6 +620,7 @@ export default {
 ::v-deep .el-card{
   border: none;
   border-radius: 0px;
+  border: 1px solid #EBEEF5;
 }
 ::v-deep .el-radio-button__inner, .el-radio-group {
      vertical-align: top;
@@ -805,17 +817,17 @@ export default {
   }
 }
 
-.right-box {
-  line-height: 25px;
-  .ranking-card {
-    margin-bottom: 10px;
-    .el-col{
-      margin-bottom: 10px;
-    }
+
+.ranking-card {
+    
+   
     .center{
       text-align: center;
     }
   }
+.right-box {
+  line-height: 25px;
+  
   .ranking-title {
   }
   .aligh-title{