wxy 4 years ago
parent
commit
bc96815abf
2 changed files with 160 additions and 272 deletions
  1. 83 77
      src/views/live/exportsDetail.vue
  2. 77 195
      src/views/live/personalDetail.vue

+ 83 - 77
src/views/live/exportsDetail.vue

@@ -15,34 +15,37 @@
               祝贺吉林省高新技术成果发布会暨中科院进吉林高新技术成果发布会成功召开
             </el-col>
           </el-col>
-          <el-col :span="24" class="right">
-            <el-col :span="24" class="top">
-              公共聊天
-            </el-col>
-            <el-col :span="24" class="list">
-              <el-col :span="24" class="chatList" v-for="(item, index) in lunboList" :key="index">
-                <el-col :span="3" class="image">
-                  <el-image :src="touxiang" style="width:30px;height:30px"></el-image>
-                </el-col>
-                <el-col :span="21" class="other">
-                  <el-col :span="24" class="one">
-                    <span class="name">{{ item.name }}</span>
-                    <span class="time">{{ item.date }}</span>
+          <el-col :span="24" class="chat">
+            <van-tabs v-model="chatactive" type="card" animated>
+              <van-tab title="公共聊天">
+                <el-col :span="24" class="right">
+                  <el-col :span="24" class="list">
+                    <el-col :span="24" class="chatList" v-for="(item, index) in lunboList" :key="index">
+                      <el-col :span="3" class="image">
+                        <el-image :src="touxiang" style="width:30px;height:30px"></el-image>
+                      </el-col>
+                      <el-col :span="21" class="other">
+                        <el-col :span="24" class="one">
+                          <span class="name">{{ item.name }}</span>
+                          <span class="time">{{ item.date }}</span>
+                        </el-col>
+                        <el-col :span="24" class="othertwo">
+                          <p class="remark">{{ item.content }}</p>
+                        </el-col>
+                      </el-col>
+                    </el-col>
                   </el-col>
-                  <el-col :span="24" class="othertwo">
-                    <p class="remark">{{ item.content }}</p>
+                  <el-col :span="24" class="send">
+                    <el-col :span="19">
+                      <el-input v-model="text" size="mini"></el-input>
+                    </el-col>
+                    <el-col :span="5">
+                      <el-button size="mini" type="primary">发送</el-button>
+                    </el-col>
                   </el-col>
                 </el-col>
-              </el-col>
-            </el-col>
-            <el-col :span="24" class="send">
-              <el-col :span="19">
-                <el-input v-model="text" size="mini"></el-input>
-              </el-col>
-              <el-col :span="5">
-                <el-button size="mini" type="primary">发送</el-button>
-              </el-col>
-            </el-col>
+              </van-tab>
+            </van-tabs>
           </el-col>
         </el-col>
       </el-col>
@@ -178,65 +181,68 @@ export default {
       padding: 15% 3%;
     }
   }
-  // 聊天
-  .right {
+  .chat {
+    margin: 15px 0 0 0;
     height: 400px;
     overflow: hidden;
-    border-left: 1px dashed #f1f1f1;
-    border-right: 1px dashed #f1f1f1;
-    border-bottom: 1px dashed #f1f1f1;
-    margin-top: 15px;
-    .top {
-      background-color: #409eff;
-      height: 33px;
-      text-align: center;
-      line-height: 33px;
-      width: 170px;
-      margin: 0px 20px 0px 100px;
-      color: white;
-    }
-    .list {
-      height: 330px;
-      overflow-y: auto;
-      overflow-x: hidden;
-      padding: 0 16px;
-      .chatList {
-        padding: 10px 0;
-        border-bottom: 1px dashed #ccc;
-        .image {
-          text-align: center;
-        }
-        .other {
-          .one {
-            .name {
-              color: #000;
-              font-size: 16px;
-              font-weight: bold;
-            }
-            .time {
-              display: inline-block;
-              margin: 0 0 0 15px;
-              color: #ccc;
-            }
+    .right {
+      height: 400px;
+      overflow: hidden;
+      border-left: 1px dashed #f1f1f1;
+      border-right: 1px dashed #f1f1f1;
+      border-bottom: 1px dashed #f1f1f1;
+      .top {
+        background-color: #409eff;
+        height: 33px;
+        text-align: center;
+        line-height: 33px;
+        width: 170px;
+        margin: 0px 20px 0px 100px;
+        color: white;
+      }
+      .list {
+        height: 330px;
+        overflow-y: auto;
+        overflow-x: hidden;
+        padding: 0 16px;
+        .chatList {
+          padding: 10px 0;
+          border-bottom: 1px dashed #ccc;
+          .image {
+            text-align: center;
           }
-          .othertwo {
-            margin: 5px 0 0 0;
-            color: #000;
-            .remark {
-              min-height: 20px;
-              font-size: 15px;
-              padding: 5px;
-              border-radius: 5px;
-              background: #245efe5f;
+          .other {
+            .one {
+              .name {
+                color: #000;
+                font-size: 16px;
+                font-weight: bold;
+              }
+              .time {
+                display: inline-block;
+                margin: 0 0 0 15px;
+                color: #ccc;
+              }
+            }
+            .othertwo {
+              margin: 5px 0 0 0;
+              color: #000;
+              .remark {
+                min-height: 20px;
+                font-size: 15px;
+                padding: 5px;
+                border-radius: 5px;
+                background: #245efe5f;
+              }
             }
           }
         }
       }
-    }
-    .send {
-      height: 40px;
-      line-height: 38px;
-      padding: 0 0 0 12px;
+      .send {
+        height: 40px;
+        line-height: 38px;
+        padding: 0 0 0 12px;
+      }
     }
   }
 }

+ 77 - 195
src/views/live/personalDetail.vue

@@ -11,66 +11,40 @@
               </video>
             </el-col>
             <el-col :span="24" class="videotwo" v-else>
-              <!-- {{ videodock.videointro }} -->
               祝贺吉林省高新技术成果发布会暨中科院进吉林高新技术成果发布会成功召开
             </el-col>
           </el-col>
-          <!-- <el-col :span="24" class="chat">
+          <el-col :span="24" class="chat">
             <van-tabs v-model="chatactive" type="card" animated>
               <van-tab title="公共聊天">
-                <el-col class="list" v-for="(item, index) in lunboList" :key="index">
-                  <el-col :span="3" class="image">
-                    <el-image :src="touxiang" style="width:30px;height:30px"></el-image>
+                <el-col :span="24" class="right">
+                  <el-col :span="24" class="list">
+                    <el-col :span="24" class="chatList" v-for="(item, index) in lunboList" :key="index">
+                      <el-col :span="3" class="image">
+                        <el-image :src="touxiang" style="width:30px;height:30px"></el-image>
+                      </el-col>
+                      <el-col :span="21" class="other">
+                        <el-col :span="24" class="one">
+                          <span class="name">{{ item.name }}</span>
+                          <span class="time">{{ item.date }}</span>
+                        </el-col>
+                        <el-col :span="24" class="othertwo">
+                          <p class="remark">{{ item.content }}</p>
+                        </el-col>
+                      </el-col>
+                    </el-col>
                   </el-col>
-                  <el-col :span="21" class="other">
-                    <el-col :span="24" class="one">
-                      <span>{{ item.name }}</span>
-                      <span>{{ item.date }}</span>
+                  <el-col :span="24" class="send">
+                    <el-col :span="19">
+                      <el-input v-model="text" size="mini"></el-input>
                     </el-col>
-                    <el-col :span="24" class="two">
-                      <p class="hywl">{{ item.content }}</p>
+                    <el-col :span="5">
+                      <el-button size="mini" type="primary">发送</el-button>
                     </el-col>
                   </el-col>
                 </el-col>
               </van-tab>
             </van-tabs>
-            <el-col :span="24" class="chat1">
-              <el-col :span="21" class="input">
-                <el-input v-model="text" placeholder="请输入聊天内容"></el-input>
-              </el-col>
-              <el-col :span="3" class="btn">
-                <el-button type="primary" size="mini">发送</el-button>
-              </el-col>
-            </el-col>
-          </el-col> -->
-          <el-col :span="24" class="right">
-            <el-col :span="24" class="top">
-              公共聊天
-            </el-col>
-            <el-col :span="24" class="list">
-              <el-col :span="24" class="chatList" v-for="(item, index) in lunboList" :key="index">
-                <el-col :span="3" class="image">
-                  <el-image :src="touxiang" style="width:30px;height:30px"></el-image>
-                </el-col>
-                <el-col :span="21" class="other">
-                  <el-col :span="24" class="one">
-                    <span class="name">{{ item.name }}</span>
-                    <span class="time">{{ item.date }}</span>
-                  </el-col>
-                  <el-col :span="24" class="othertwo">
-                    <p class="remark">{{ item.content }}</p>
-                  </el-col>
-                </el-col>
-              </el-col>
-            </el-col>
-            <el-col :span="24" class="send">
-              <el-col :span="19">
-                <el-input v-model="text" size="mini"></el-input>
-              </el-col>
-              <el-col :span="5">
-                <el-button size="mini" type="primary">发送</el-button>
-              </el-col>
-            </el-col>
           </el-col>
           <el-col :span="24" class="market">
             <van-tabs v-model="marketactive" type="card" animated>
@@ -423,160 +397,68 @@ export default {
       padding: 15% 3%;
     }
   }
-  // 聊天
-  // .chat {
-  //   margin: 15px 0 0 0;
-  //   height: 400px;
-  //   overflow: hidden;
-  //   .list {
-  //     padding: 10px 16px;
-  //     border-bottom: 1px dashed #ccc;
-  //     .image {
-  //       text-align: center;
-  //     }
-  //     .other {
-  //       .one {
-  //         span:nth-child(1) {
-  //           color: #000;
-  //           font-size: 16px;
-  //           font-weight: bold;
-  //         }
-  //         span:nth-child(2) {
-  //           display: inline-block;
-  //           margin: 0 0 0 15px;
-  //           color: #ccc;
-  //         }
-  //       }
-  //       .two {
-  //         margin: 5px 0 0 0;
-  //         color: #000;
-  //         .zh {
-  //           min-height: 20px;
-  //           font-size: 15px;
-  //           padding: 5px;
-  //           border-radius: 5px;
-  //           background: #ea4235;
-  //         }
-  //         .hywl {
-  //           min-height: 20px;
-  //           font-size: 15px;
-  //           padding: 5px;
-  //           border-radius: 5px;
-  //           background: #245efe5f;
-  //           .hand {
-  //             width: 12px;
-  //             top: 3px;
-  //             left: 5px;
-  //             margin: 0px 0 0 5px;
-  //           }
-  //         }
-  //         .remark {
-  //           min-height: 20px;
-  //           font-size: 15px;
-  //           padding: 5px;
-  //           border-radius: 5px;
-  //           background: #cccccc5f;
-  //         }
-  //       }
-  //     }
-  //   }
-  //   .chat1 {
-  //     height: 40px;
-  //     .input {
-  //       /deep/.el-input__inner {
-  //         height: 35px;
-  //         line-height: 35px;
-  //       }
-  //     }
-  //     .btn {
-  //       /deep/.el-button--mini,
-  //       .el-button--mini.is-round {
-  //         padding: 10px 15px;
-  //         width: 100%;
-  //       }
-  //     }
-  //   }
-  //   // 主办方
-  //   .company {
-  //     margin: 15px 0 0 0;
-  //     .name {
-  //       margin: 0 0 20px 0;
-  //       padding: 0 10px;
-  //       p {
-  //         text-align: center;
-  //         color: #409eff;
-  //       }
-  //       p:nth-child(1) {
-  //         font-family: cursive;
-  //         font-size: 30px;
-  //         font-weight: bolder;
-  //         text-shadow: 5px 5px 2px #ccc;
-  //       }
-  //       p:nth-child(2) {
-  //         padding: 10px 0 0 0;
-  //         font-size: 20px;
-  //       }
-  //     }
-  //   }
-  // }
-  .right {
+  .chat {
+    margin: 15px 0 0 0;
     height: 400px;
     overflow: hidden;
-    border-left: 1px dashed #f1f1f1;
-    border-right: 1px dashed #f1f1f1;
-    border-bottom: 1px dashed #f1f1f1;
-    margin-top: 15px;
-    .top {
-      background-color: #409eff;
-      height: 33px;
-      text-align: center;
-      line-height: 33px;
-      width: 170px;
-      margin: 0px 20px 0px 100px;
-      color: white;
-    }
-    .list {
-      height: 330px;
-      overflow-y: auto;
-      overflow-x: hidden;
-      padding: 0 16px;
-      .chatList {
-        padding: 10px 0;
-        border-bottom: 1px dashed #ccc;
-        .image {
-          text-align: center;
-        }
-        .other {
-          .one {
-            .name {
-              color: #000;
-              font-size: 16px;
-              font-weight: bold;
-            }
-            .time {
-              display: inline-block;
-              margin: 0 0 0 15px;
-              color: #ccc;
-            }
+    .right {
+      height: 400px;
+      overflow: hidden;
+      border-left: 1px dashed #f1f1f1;
+      border-right: 1px dashed #f1f1f1;
+      border-bottom: 1px dashed #f1f1f1;
+      .top {
+        background-color: #409eff;
+        height: 33px;
+        text-align: center;
+        line-height: 33px;
+        width: 170px;
+        margin: 0px 20px 0px 100px;
+        color: white;
+      }
+      .list {
+        height: 330px;
+        overflow-y: auto;
+        overflow-x: hidden;
+        padding: 0 16px;
+        .chatList {
+          padding: 10px 0;
+          border-bottom: 1px dashed #ccc;
+          .image {
+            text-align: center;
           }
-          .othertwo {
-            margin: 5px 0 0 0;
-            color: #000;
-            .remark {
-              min-height: 20px;
-              font-size: 15px;
-              padding: 5px;
-              border-radius: 5px;
-              background: #245efe5f;
+          .other {
+            .one {
+              .name {
+                color: #000;
+                font-size: 16px;
+                font-weight: bold;
+              }
+              .time {
+                display: inline-block;
+                margin: 0 0 0 15px;
+                color: #ccc;
+              }
+            }
+            .othertwo {
+              margin: 5px 0 0 0;
+              color: #000;
+              .remark {
+                min-height: 20px;
+                font-size: 15px;
+                padding: 5px;
+                border-radius: 5px;
+                background: #245efe5f;
+              }
             }
           }
         }
       }
-    }
-    .send {
-      height: 40px;
-      line-height: 38px;
-      padding: 0 0 0 12px;
+      .send {
+        height: 40px;
+        line-height: 38px;
+        padding: 0 0 0 12px;
+      }
     }
   }
   // 科技超市