Merge branch 'master' of http://git.cc-lotus.info/service-platform/web-test

public/static/css/style.css

@@ -794,14 +794,13 @@ p {
 }
 
 .chat .chatList {
-    height: 505px;
     background: #fff;
 }
 
 .chat .chatList ul {
     float: left;
     width: 100%;
-    height: 454px;
+    height: 350px;
     padding: 5px 0 0 0;
     overflow: auto;
     margin: 10px 0 0 0;

src/components/parts/chat.vue

@@ -1,24 +1,26 @@
 <template>
   <div id="chat">
-    <p class="luyanTop">
-      <span>公共聊天</span>
-      <!-- <span class="icon"><i class="iconfont icon-xianhua" style="color:red"></i>送鲜花</span>
+    <el-row class="chat">
+      <p class="luyanTop">
+        <span>公共聊天</span>
+        <!-- <span class="icon"><i class="iconfont icon-xianhua" style="color:red"></i>送鲜花</span>
       <span class="icon"><i class="iconfont icon-xin" style="color:red;"></i>发贺信</span> -->
-    </p>
-    <div class="chatList">
-      <ul>
-        <li v-for="(i, index) in list" :key="index">
-          <p>
-            <span>[{{ i.send_time | getTime }}]</span><span style="font-weight: bold;">{{ i.sender_name }}：</span>
-            <span> {{ i.content }}</span>
-          </p>
-        </li>
-      </ul>
-      <div class="input">
-        <input v-model="text" />
-        <button type="button" @click="send" class="anniu">发送</button>
+      </p>
+      <div class="chatList">
+        <ul>
+          <li v-for="(i, index) in list" :key="index">
+            <p>
+              <span>[{{ i.send_time | getTime }}]</span><span style="font-weight: bold;">{{ i.sender_name }}：</span>
+              <span> {{ i.content }}</span>
+            </p>
+          </li>
+        </ul>
+        <div class="input">
+          <input v-model="text" />
+          <button type="button" @click="send" class="anniu">发送</button>
+        </div>
       </div>
-    </div>
+    </el-row>
   </div>
 </template>
 
@@ -116,10 +118,10 @@ export default {
 </script>
 
 <style lang="less" scoped>
-.fangtan .chat {
+.chat {
   float: left;
-  width: 30%;
-  height: 545px;
+  width: 100%;
+  height: 515px;
   border-radius: 5px;
   box-shadow: 0 0 5px #c20808;
   padding: 0 10px 0px 10px;
@@ -155,14 +157,17 @@ export default {
 }
 
 .chat .chatList {
-  height: 505px;
   background: #fff;
+  float: left;
+  width: 100%;
+  height: 480px;
+  overflow: hidden;
 }
 
 .chat .chatList ul {
   float: left;
   width: 100%;
-  height: 454px;
+  height: 405px;
   padding: 5px 0 0 0;
   overflow: auto;
   margin: 10px 0 0 0;
@@ -183,7 +188,6 @@ export default {
   line-height: 40px;
   float: left;
   width: 100%;
-  padding: 55px 0 0 0;
 }
 
 .chat .chatList .input input[data-v-5189f7b7] {

src/views/direct.vue

@@ -262,56 +262,52 @@
               </el-tab-pane>
             </el-tabs>
           </el-col>
-
           <el-col :span="24" class="newimage2">
             <el-image :src="two" style="width:100%;height:100px;position:relative;"> </el-image>
           </el-col>
-
-          <el-col :span="24">
-            <div class="fangtan">
-              <el-col :span="7" class="jiabin">
-                <p class="jiabintop">
-                  <span>嘉宾访谈</span>
-                  <el-link :underline="false">MORE</el-link>
-                </p>
-                <div class="jiabinlist">
-                  <ul>
-                    <li v-for="(ref, index) in jiabinlist" :key="index">
-                      <img :src="ref.url" />
-                      <p>
-                        <span class="textOver">{{ ref.title }}</span>
-                        <span>{{ ref.date }}</span>
-                        <span class="text">{{ ref.context }} </span>
-                      </p>
-                    </li>
-                  </ul>
-                </div>
-              </el-col>
-              <el-col :span="7" class="jiabin luyan">
-                <p class="jiabintop luyanTop">
-                  <span>项目路演</span>
-                  <el-link :underline="false">MORE</el-link>
-                </p>
-                <div class="luyanList">
-                  <ul>
-                    <li v-for="(item, index) in luyanList" :key="index">
-                      <p>
-                        <span>{{ item.title }}</span>
-                        <span>浏览:{{ item.num }}</span>
-                      </p>
-                      <p>
-                        <span>所在地区：{{ item.city }} | 所属行业：{{ item.hy }}</span>
-                        <span>项目融资方式：{{ item.xurz }}</span>
-                      </p>
-                    </li>
-                  </ul>
-                </div>
-              </el-col>
-              <el-col :span="7" class="chat">
-                <chat></chat>
-              </el-col>
-            </div>
-          </el-col>
+          <div class="fangtan">
+            <el-col :span="7" class="jiabin">
+              <p class="jiabintop">
+                <span>嘉宾访谈</span>
+                <el-link :underline="false">MORE</el-link>
+              </p>
+              <div class="jiabinlist">
+                <ul>
+                  <li v-for="(ref, index) in jiabinlist" :key="index">
+                    <img :src="ref.url" />
+                    <p>
+                      <span class="textOver">{{ ref.title }}</span>
+                      <span>{{ ref.date }}</span>
+                      <span class="text">{{ ref.context }} </span>
+                    </p>
+                  </li>
+                </ul>
+              </div>
+            </el-col>
+            <el-col :span="7" class="jiabin luyan">
+              <p class="jiabintop luyanTop">
+                <span>项目路演</span>
+                <el-link :underline="false">MORE</el-link>
+              </p>
+              <div class="luyanList">
+                <ul>
+                  <li v-for="(item, index) in luyanList" :key="index">
+                    <p>
+                      <span>{{ item.title }}</span>
+                      <span>浏览:{{ item.num }}</span>
+                    </p>
+                    <p>
+                      <span>所在地区：{{ item.city }} | 所属行业：{{ item.hy }}</span>
+                      <span>项目融资方式：{{ item.xurz }}</span>
+                    </p>
+                  </li>
+                </ul>
+              </div>
+            </el-col>
+            <el-col :span="7" class="chat">
+              <chat></chat>
+            </el-col>
+          </div>
         </el-col>
       </div>
     </el-col>
@@ -469,13 +465,6 @@ export default {
         hy: '所属行业',
         xurz: '股权融资',
       },
-      {
-        title: '项目路演',
-        num: '1234',
-        city: '吉林省',
-        hy: '所属行业',
-        xurz: '股权融资',
-      },
     ],
 
     superOne: require('@/assets/live/main1.png'),
@@ -828,7 +817,8 @@ p {
 }
 
 .fangtan {
-  height: 631px;
+  float: left;
+  height: 525px;
   overflow: hidden;
 }
 
@@ -838,7 +828,7 @@ p {
   box-shadow: 0 0 5px #c20808;
   padding: 0 10px 0px 10px;
   margin: 4px 15px 0 3px;
-  height: 624px;
+  height: 515px;
 }
 
 .jiabin .jiabintop {
@@ -891,15 +881,16 @@ p {
 
 .jiabin .jiabinlist ul li p span:first-child {
   float: left;
-  width: 100%;
+  width: 65%;
   font-size: 18px;
 }
 
 .jiabin .jiabinlist ul li p span:nth-child(2n) {
   float: left;
-  width: 100%;
+  width: 35%;
   font-size: 14px;
-  padding: 5px 0;
+  text-align: right;
+  padding: 2px 0 0 0;
 }
 
 .jiabin .jiabinlist ul li p span:last-child {
@@ -909,7 +900,7 @@ p {
   color: #888;
   overflow: hidden;
   text-overflow: ellipsis;
-  -webkit-line-clamp: 3;
+  -webkit-line-clamp: 2;
   word-break: break-all;
   display: -webkit-box;
   -webkit-box-orient: vertical;
@@ -921,7 +912,7 @@ p {
   box-shadow: 0 0 5px #c20808;
   padding: 0 10px 0px 10px;
   margin: 4px 10px 0 3px;
-  height: 624px;
+  height: 515px;
   overflow: hidden;
 }
 
@@ -936,11 +927,9 @@ p {
 }
 .luyanList ul li {
   float: left;
-
   border-radius: 10px;
   padding: 5px 10px;
-  margin: 0 0 7px 0;
-  // width: 96%;
+  margin: 0 0 10px 0;
   height: 95px;
   border: 1px solid #ff8500;
 }
@@ -978,95 +967,10 @@ p {
   font-size: 14px;
   color: #666;
 }
-
-.fangtan .chat {
-  width: 33%;
-
-  height: 624px;
-  border-radius: 5px;
-  box-shadow: 0 0 5px #c20808;
-  padding: 0 10px 0px 10px;
-  margin: 4px 0px 0 3px;
-}
-
-.chat .luyanTop {
-  height: 30px;
-  line-height: 30px;
-}
-
-.chat .luyanTop span:first-child {
-  display: inline-block;
-  padding: 0 10px;
-  height: 30px;
-  color: #fff;
-  background-color: #ff8500;
-  border-bottom-left-radius: 10px;
-  border-bottom-right-radius: 10px;
-}
-
-.chat .luyanTop .icon {
-  float: right;
-  background: #f2f4f5;
-  border-radius: 20px;
-  color: #666;
-  padding: 0 5px;
-  margin: 0 0 0 5px;
-}
-
-.chat .luyanTop .icon {
-  cursor: pointer;
-}
-
-.chat .chatList {
-  height: 505px;
-  background: #fff;
-}
-
-.chat .chatList ul {
+.chat {
   float: left;
-  width: 100%;
-  height: 454px;
-  padding: 5px 0 0 0;
-  overflow: auto;
-  margin: 10px 0 0 0;
-}
-
-.chat .chatList ul li {
-  padding: 0 10px;
-  margin: 0 0 5px 0;
-}
-
-.chat .chatList ul li span:first-child {
-  color: #666;
-  padding: 0 5px 0 0;
-}
-
-.chat .chatList .input {
-  height: 40px;
-  line-height: 40px;
-  float: left;
-  width: 100%;
-}
-
-.chat .chatList .input input {
-  border: 1px solid #ccc;
-  float: left;
-  height: 38px;
-  width: 79%;
-}
-
-.chat .chatList .input button {
-  float: left;
-  background: forestgreen;
-  color: #fff;
-  height: 42px;
-  width: 67px;
-}
-.jiabinlist ul {
-  margin: 0;
-  padding: 0;
+  width: 33%;
 }
-
 // 找产品
 .demand {
   overflow: hidden;