fix: 点击动态

pages/meetingRoomList/meetingRoomList.axml

@@ -3,24 +3,6 @@
     <view onTap="selectSearchTime">{{search.time.split('-')[0]}}年{{search.time.split('-')[1]}}月{{search.time.split('-')[2]}}日</view>
     <view class="iconfont iconicon_open"></view>
   </view>
-<<<<<<< HEAD
-  <scroll-view scroll-y="{{canScroll}}" class="roomScrollView">
-    <view class="reserveMeeting">
-      <view class="meetingRoomContent" a:for="{{reserveRoomList}}" data-roomid="{{item.meetingRoomId}}" data-roomname="{{item.name}}" onTap="changeRoomTime">
-        <view class="roomMessage">
-          <view class="reserveRoomMsg">
-            <view class="reserveRoomTitle">
-            {{item.name}}
-            </view>
-            <view class="reserveRoomEquipFacility" a:if="{{item.equipFacilityNames.length>0}}">
-              <text class="locationIcon iconfont iconicon_app1"></text>
-              <text a:for="{{item.equipFacilityNames}}" a:if="{{item2 !== null}}" a:for-item="item2" a:for-index="index2">{{item2}}{{index2 === item.equipFacilityNames.length-1 ? '' : '/'}}</text>
-            </view>
-            <view class="reserveRoomNumAndLocation">
-              <view class="reserveRoomNum">
-                <text class="locationIcon iconfont iconicon_attender"></text>{{item.capacityNum}}
-              </view>
-=======
 </view>
 <scroll-view scroll-y="{{canScroll}}" class="roomScrollView">
   <view class="reserveMeeting">
@@ -37,7 +19,6 @@
           <view class="reserveRoomNumAndLocation">
             <view class="reserveRoomNum">
               <text class="locationIcon iconfont iconicon_attender"></text>{{item.capacityNum}}
->>>>>>> 0bb70fc239de7a68697d99656080c7fd65215e1f
             </view>
           </view>
         </view>