wxy 4 年之前
父節點
當前提交
97e9db3c02
共有 2 個文件被更改,包括 258 次插入157 次删除
  1. 73 86
      src/views/live/exportsDetail.vue
  2. 185 71
      src/views/live/personalDetail.vue

+ 73 - 86
src/views/live/exportsDetail.vue

@@ -15,28 +15,34 @@
               祝贺吉林省高新技术成果发布会暨中科院进吉林高新技术成果发布会成功召开
             </el-col>
           </el-col>
-          <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="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="21" class="other">
-                    <el-col :span="24" class="one">
-                      <span>{{ item.name }}</span>
-                      <span>{{ item.date }}</span>
-                    </el-col>
-                    <el-col :span="24" class="two">
-                      <p class="hywl">{{ item.content }}</p>
-                    </el-col>
+                  <el-col :span="24" class="othertwo">
+                    <p class="remark">{{ item.content }}</p>
                   </el-col>
                 </el-col>
-              </van-tab>
-              <!-- <van-tab title="公共聊天">
-                <chat></chat>
-              </van-tab> -->
-            </van-tabs>
+              </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>
       </el-col>
@@ -173,83 +179,64 @@ export default {
     }
   }
   // 聊天
-  .chat {
-    margin: 15px 0 0 0;
+  .right {
     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 {
-      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;
-          }
+      height: 330px;
+      overflow-y: auto;
+      overflow-x: hidden;
+      padding: 0 16px;
+      .chatList {
+        padding: 10px 0;
+        border-bottom: 1px dashed #ccc;
+        .image {
+          text-align: center;
         }
-        .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;
+        .other {
+          .one {
+            .name {
+              color: #000;
+              font-size: 16px;
+              font-weight: bold;
+            }
+            .time {
+              display: inline-block;
+              margin: 0 0 0 15px;
+              color: #ccc;
             }
           }
-          .remark {
-            min-height: 20px;
-            font-size: 15px;
-            padding: 5px;
-            border-radius: 5px;
-            background: #cccccc5f;
+          .othertwo {
+            margin: 5px 0 0 0;
+            color: #000;
+            .remark {
+              min-height: 20px;
+              font-size: 15px;
+              padding: 5px;
+              border-radius: 5px;
+              background: #245efe5f;
+            }
           }
         }
       }
     }
-    // 主办方
-    .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;
-        }
-      }
+    .send {
+      height: 40px;
+      line-height: 38px;
+      padding: 0 0 0 12px;
     }
   }
 }

+ 185 - 71
src/views/live/personalDetail.vue

@@ -15,7 +15,7 @@
               祝贺吉林省高新技术成果发布会暨中科院进吉林高新技术成果发布会成功召开
             </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">
@@ -33,10 +33,44 @@
                   </el-col>
                 </el-col>
               </van-tab>
-              <!-- <van-tab title="公共聊天">
-                <chat></chat>
-              </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>
@@ -141,6 +175,9 @@ export default {
       lunboList: [
         { name: '顾红伟', date: '10:00', content: '信息内容' },
         { name: '顾红伟', date: '10:00', content: '信息内容' },
+        { name: '顾红伟', date: '10:00', content: '信息内容' },
+        { name: '顾红伟', date: '10:00', content: '信息内容' },
+        { name: '顾红伟', date: '10:00', content: '信息内容' },
       ],
       // 聊天
       chatactive: 0,
@@ -301,6 +338,7 @@ export default {
         },
       ],
       sx: require('@/assets/sx.png'),
+      text: '',
     };
   },
   created() {},
@@ -386,83 +424,159 @@ export default {
     }
   }
   // 聊天
-  .chat {
-    margin: 15px 0 0 0;
+  // .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 {
     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 {
-      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;
-          }
+      height: 330px;
+      overflow-y: auto;
+      overflow-x: hidden;
+      padding: 0 16px;
+      .chatList {
+        padding: 10px 0;
+        border-bottom: 1px dashed #ccc;
+        .image {
+          text-align: center;
         }
-        .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;
+        .other {
+          .one {
+            .name {
+              color: #000;
+              font-size: 16px;
+              font-weight: bold;
+            }
+            .time {
+              display: inline-block;
+              margin: 0 0 0 15px;
+              color: #ccc;
             }
           }
-          .remark {
-            min-height: 20px;
-            font-size: 15px;
-            padding: 5px;
-            border-radius: 5px;
-            background: #cccccc5f;
+          .othertwo {
+            margin: 5px 0 0 0;
+            color: #000;
+            .remark {
+              min-height: 20px;
+              font-size: 15px;
+              padding: 5px;
+              border-radius: 5px;
+              background: #245efe5f;
+            }
           }
         }
       }
     }
-    // 主办方
-    .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;
-        }
-      }
+    .send {
+      height: 40px;
+      line-height: 38px;
+      padding: 0 0 0 12px;
     }
   }
   // 科技超市