Merge branch 'zhp' of http://code.qutaovip.com/lihai/pad_spa into feat/lihai

src/components/common/layout/layout.vue

@@ -96,8 +96,8 @@
                 @click="readMsgToOrderDetails(item)"
               >
                 <div class="content-bar flex flex-column">
-                  <div class="desc-info">{{item.sender_name}}</div>
-                  <div class="desc-time">{{item.msg | ellipsis(80)}}</div>
+                  <div class="desc-info">{{item.project_name}}</div>
+                  <div class="desc-time">{{`${item.device_name} ${item.room}` | ellipsis(80)}}</div>
                 </div>
                 <div class="count flex flex-column items-center">
                   <div class="time">{{item.create_time}}</div>
@@ -134,9 +134,9 @@
               @click="readMsgToOrderDetails(item)"
             >
               <div class="info flex">
-                <!-- <div class="name">张三</div>
-                <div class="project">121212122</div> -->
-                {{item.msg | ellipsis(50)}}
+                <div class="name">{{item.nickname}}</div>
+                <div class="project">成功预约{{item.order_time}}</div>
+                <!-- {{item.nickname | ellipsis(50)}} -->
               </div>
               <div class="flex flex-column items-center">
                 <div class="time">{{item.create_time}}</div>
@@ -173,9 +173,9 @@
               @click="readMsgToOrderDetails(item)"
             >
               <div class="info flex">
-                <!-- <div class="name">张三</div>
-                <div class="project">121212122</div> -->
-                {{item.msg | ellipsis(50)}}
+                <div class="name">{{item.nickname}}</div>
+                <div class="project">取消预约{{item.order_time}}</div>
+                <!-- {{item.msg | ellipsis(50)}} -->
               </div>
               <div class="flex flex-column items-center">
                 <div class="time">{{item.create_time}}</div>
@@ -792,7 +792,8 @@ export default {
     }
   }
   .msg-bar {
-    margin-top: 18px;
+    // margin-top: 18px;
+    height: 55px;
     .info {
       width: 400px;
       line-height: 18px;
@@ -800,7 +801,9 @@ export default {
         font-weight: 600;
         margin-right: 5px;
       }
-      .project {}
+      .project {
+        color: #666666;
+      }
     }
   }
 }