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

src/views/hall/direct.vue

@@ -430,7 +430,7 @@ export default {
     expeDetail,
   },
   data: () => ({
-    hand: require('@/assets/emotion/flower.png'),
+    hand: require('@/assets/emotion/flower2.gif'),
     achievezb: require('@/assets/3.png'),
     touxiang: require('@/assets/emotion/touxiang.png'),
     videodisplay: 'list',
@@ -576,6 +576,9 @@ export default {
         var date = moment(val.meta.createdAt).format('YYYY-MM-DD hh:mm');
         val.date = date;
       }
+      // 同时在线
+      let tszx = jioayi.data.filter(f => f.type == '0');
+      if (tszx) this.$set(this.statNum, `tszx`, tszx.length);
       this.$set(this, `lunboList`, jioayi.data.reverse());
       // 展会动态结束
       let zxzd = await this.danceQuery({ dock_id: this.dock_id });
@@ -905,25 +908,29 @@ export default {
     }
     .right {
       height: 470px;
-      background-color: #2e2f33;
       border-top-left-radius: 5px;
       border-bottom-left-radius: 5px;
       overflow: hidden;
+      background: #f0ffff5f;
+      border-bottom: 1px solid #f1f1f1;
       .rightFirst {
         color: #fff;
         height: 430px;
-        padding: 0 10px;
+        padding: 0 0 0 10px;
         .list {
           overflow: auto;
           .lunboList {
             padding: 10px 0;
+            border-bottom: 1px dashed #ff0000;
             .image {
               text-align: center;
             }
             .other {
               .one {
                 span:nth-child(1) {
-                  color: #fff;
+                  color: #000;
+                  font-size: 16px;
+                  font-weight: bold;
                 }
                 span:nth-child(2) {
                   display: inline-block;
@@ -933,6 +940,7 @@ export default {
               }
               .two {
                 margin: 5px 0 0 0;
+                color: #000;
                 .zh {
                   min-height: 20px;
                   font-size: 15px;
@@ -947,9 +955,10 @@ export default {
                   border-radius: 5px;
                   background: #245efe5f;
                   .hand {
-                    width: 35px;
+                    width: 30px;
                     top: 6px;
                     left: 5px;
+                    margin: 0px 0 0 10px;
                   }
                 }
                 .remark {

src/views/market/detail/techDetail.vue

@@ -286,15 +286,17 @@ export default {
   .achieveImage {
     height: 305px;
     overflow: hidden;
-    // padding: 60px 0;
     p:nth-child(1) {
       font-size: 25px;
       text-align: left;
       padding: 10px 0;
     }
     p:nth-child(2) {
-      font-size: 70px;
-      padding: 15px 0;
+      margin: 60px 0 0 0;
+      text-align: center;
+      .el-rate__icon {
+        font-size: 60px;
+      }
     }
     // padding: 50px 0;
     // height: 305px;