修改消息通知

src/components/tools/HeaderNotice.vue

@@ -79,6 +79,46 @@
 
               </a-tab-pane>
               <a-tab-pane tab="订单消息" key="4">
+                <a-list>
+                  <a-list-item
+                      :key="index"
+                      v-for="(record, index) in announcement2"
+                  >
+                    <div style="margin-left: 5%; width: 80%">
+                      <p>
+                        <a @click="showAnnouncement(record)">{{ record.titile }}</a>
+                      </p>
+                      <p style="color: rgba(0, 0, 0, 0.45); margin-bottom: 0px">
+                        {{ record.createTime }} 发布
+                      </p>
+                    </div>
+                    <div style="text-align: right">
+                      <a-tag
+                          @click="showAnnouncement(record)"
+                          v-if="record.priority === 'L'"
+                          color="blue"
+                      >一般消息</a-tag
+                      >
+                      <a-tag
+                          @click="showAnnouncement(record)"
+                          v-if="record.priority === 'M'"
+                          color="orange"
+                      >重要消息</a-tag
+                      >
+                      <a-tag
+                          @click="showAnnouncement(record)"
+                          v-if="record.priority === 'H'"
+                          color="red"
+                      >紧急消息</a-tag
+                      >
+                    </div>
+                  </a-list-item>
+                  <div style="margin-top: 5px; text-align: center">
+                    <a-button @click="toMyAnnouncement()" type="dashed" block
+                    >查看更多</a-button
+                    >
+                  </div>
+                </a-list>
 
               </a-tab-pane>
               <a-tab-pane tab="商城消息" key="5">
@@ -94,46 +134,6 @@
 
           </a-tab-pane>
           <a-tab-pane :tab="msg2Title" key="2">
-            <a-list>
-              <a-list-item
-                :key="index"
-                v-for="(record, index) in announcement2"
-              >
-                <div style="margin-left: 5%; width: 80%">
-                  <p>
-                    <a @click="showAnnouncement(record)">{{ record.titile }}</a>
-                  </p>
-                  <p style="color: rgba(0, 0, 0, 0.45); margin-bottom: 0px">
-                    {{ record.createTime }} 发布
-                  </p>
-                </div>
-                <div style="text-align: right">
-                  <a-tag
-                    @click="showAnnouncement(record)"
-                    v-if="record.priority === 'L'"
-                    color="blue"
-                    >一般消息</a-tag
-                  >
-                  <a-tag
-                    @click="showAnnouncement(record)"
-                    v-if="record.priority === 'M'"
-                    color="orange"
-                    >重要消息</a-tag
-                  >
-                  <a-tag
-                    @click="showAnnouncement(record)"
-                    v-if="record.priority === 'H'"
-                    color="red"
-                    >紧急消息</a-tag
-                  >
-                </div>
-              </a-list-item>
-              <div style="margin-top: 5px; text-align: center">
-                <a-button @click="toMyAnnouncement()" type="dashed" block
-                  >查看更多</a-button
-                >
-              </div>
-            </a-list>
           </a-tab-pane>
         </a-tabs>
       </a-spin>
@@ -201,7 +201,7 @@ export default {
   },
   mounted() {
     this.loadData();
-    //this.timerFun();
+    this.timerFun();
     this.initWebSocket();
     // this.heartCheckFun();
   },

src/views/room/fangtailive.vue

@@ -4,6 +4,7 @@
       <a-tab-pane key="1" tab="实时房态"> </a-tab-pane>
       <a-tab-pane key="2" tab="日历房态"> </a-tab-pane>
       <a-tab-pane key="3" tab="客单"> </a-tab-pane>
+<!--      <a-tab-pane key="3" tab="预定单"> </a-tab-pane>-->
       <a-tab-pane key="4" tab="远期房态"> </a-tab-pane>
       <a-tab-pane key="5" tab="物品租借"> </a-tab-pane>
       <a-tab-pane key="6" tab="客人留言"> </a-tab-pane>

src/views/room/modules/checkIn/BillRoomInfo.vue

@@ -28,7 +28,7 @@
                 style="color: rgba(255, 141, 26, 1); font-size: 18px"
               /><a-button type="link"> 叫醒服务 </a-button>
             </div>
-            <div style="display: flex; flex-direction: column" @click="splitLiving">
+            <div style="display: flex; flex-direction: column" @click="splitLiving" v-if="model.livingRoomIds.length > 2">
               <a-icon
                 type="compass"
                 style="color: rgba(255, 141, 26, 1); font-size: 18px"