Merge branch 'case' into dev

# Conflicts:
#	.env.development
#	.gitignore
#	src/components/Course/weikeContent.vue
#	src/components/PdfPreview/view.vue
#	src/views/portal/case/Detail.vue
#	src/views/portal/case/Index.vue

src/views/Index.vue

@@ -105,6 +105,47 @@
             </el-card>
           </div>
         </div>
+      </div>
+        <!-- 推荐案例2版 -->
+      <div class="modules">
+         <div class="modules-title">
+    
+      <span class="modules-text">推荐案例</span>
+      <span class="quyer-tag">
+      <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-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">
+                   {{ca.title}}
+                </span>
+                <div class="case-text three-line-ellipsis">
+                    {{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 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>
+      
       </div>
       <!-- 推荐案例 -->
       <!-- <div class="modules">
@@ -153,6 +194,7 @@
           </el-col>
         </el-row>
       </div> -->
+    
       <!-- 推荐文章 -->
       <div class="modules">
         <!--内容块-->
@@ -313,7 +355,7 @@ export default {
         list: []
       },
       caseList: {
-        num: 4,
+        num: 6,
         orderType: 2,
         list: []
       },
@@ -430,6 +472,7 @@ export default {
             let userIds = [];
             res.result.forEach(item => {
               item.authorInfo = { aid: '', name: '', orgInfo: '', avatar: '', code: '',sex:null };
+              
               if (item.authorId && item.authorId != '') {
                 userIds.push(item.authorId);
               }
@@ -583,6 +626,61 @@ export default {
 </script>
 
 <style scoped lang="scss">
+.three-line-ellipsis {
+    overflow: hidden;
+    text-overflow: ellipsis;
+     box-sizing: border-box;
+  -webkit-line-clamp: 3;
+    word-break: break-all;
+     display: -webkit-box;
+  -webkit-box-orient: vertical;
+}
+.casetwo{
+  border: 1px solid #F0F0F0;
+  width: 100%;
+  height: 220px;
+  margin-bottom:15px;
+ position: relative;
+  background-color: #fff;
+  .case-top{
+    height: 70px;
+     background-image: linear-gradient(to right , #b8c7e2, #d0dcf3);
+  }
+  .case-conent{
+    width: 100%;
+    height: 100%;
+    // box-shadow: 1px 1px 15px #ccc;
+    // position: absolute;
+    // top: 5%;
+    background-color: #fff;
+    // left: 4%;
+    padding: 16px;
+    .case-time{
+      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{
+      width: 100%;
+      border-bottom: 1px solid #f3f3f3;
+    }
+   
+  }
+}
 // .qa-dai{
 //   color: #5da1ff;
 // }