浏览代码

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

黎海 2 年之前
父节点
当前提交
7448211e47
共有 1 个文件被更改,包括 13 次插入10 次删除
  1. 13 10
      src/components/common/layout/layout.vue

+ 13 - 10
src/components/common/layout/layout.vue

@@ -96,8 +96,8 @@
96 96
                 @click="readMsgToOrderDetails(item)"
97 97
               >
98 98
                 <div class="content-bar flex flex-column">
99
-                  <div class="desc-info">{{item.sender_name}}</div>
100
-                  <div class="desc-time">{{item.msg | ellipsis(80)}}</div>
99
+                  <div class="desc-info">{{item.project_name}}</div>
100
+                  <div class="desc-time">{{`${item.device_name} ${item.room}` | ellipsis(80)}}</div>
101 101
                 </div>
102 102
                 <div class="count flex flex-column items-center">
103 103
                   <div class="time">{{item.create_time}}</div>
@@ -134,9 +134,9 @@
134 134
               @click="readMsgToOrderDetails(item)"
135 135
             >
136 136
               <div class="info flex">
137
-                <!-- <div class="name">张三</div>
138
-                <div class="project">121212122</div> -->
139
-                {{item.msg | ellipsis(50)}}
137
+                <div class="name">{{item.nickname}}</div>
138
+                <div class="project">成功预约{{item.order_time}}</div>
139
+                <!-- {{item.nickname | ellipsis(50)}} -->
140 140
               </div>
141 141
               <div class="flex flex-column items-center">
142 142
                 <div class="time">{{item.create_time}}</div>
@@ -173,9 +173,9 @@
173 173
               @click="readMsgToOrderDetails(item)"
174 174
             >
175 175
               <div class="info flex">
176
-                <!-- <div class="name">张三</div>
177
-                <div class="project">121212122</div> -->
178
-                {{item.msg | ellipsis(50)}}
176
+                <div class="name">{{item.nickname}}</div>
177
+                <div class="project">取消预约{{item.order_time}}</div>
178
+                <!-- {{item.msg | ellipsis(50)}} -->
179 179
               </div>
180 180
               <div class="flex flex-column items-center">
181 181
                 <div class="time">{{item.create_time}}</div>
@@ -792,7 +792,8 @@ export default {
792 792
     }
793 793
   }
794 794
   .msg-bar {
795
-    margin-top: 18px;
795
+    // margin-top: 18px;
796
+    height: 55px;
796 797
     .info {
797 798
       width: 400px;
798 799
       line-height: 18px;
@@ -800,7 +801,9 @@ export default {
800 801
         font-weight: 600;
801 802
         margin-right: 5px;
802 803
       }
803
-      .project {}
804
+      .project {
805
+        color: #666666;
806
+      }
804 807
     }
805 808
   }
806 809
 }