Merge branch 'dev' of http://git.ycjcjy.com/shigongli/miniapp-v2 into dev

src/hotel/pages/landlord/roomOrder/roomOrder.jsx

@@ -4,7 +4,7 @@ import CustomNav from '@/components/CustomNav'
 import Taro from '@tarojs/taro'
 import { useModel } from '@/store'
 import copy from '@/assets/icons/landlord/copy.png'
-import {View,  Label, Image } from '@tarojs/components'
+import { View, Label, Image } from '@tarojs/components'
 import List from '@/components/List';
 import { getRoomOrderList, getHotelDetail } from '@/services/landlord'
 import './roomOrder.less'

src/pages/index/index.jsx

@@ -48,6 +48,7 @@ export default withLayout((props) => {
     setCurrentTab(index)
 
     if (index === 1) {
+      // 民宿离店消息
       withSubscribeMessage([TPL_MESSAGE_HOTEL_CHECK_OUT])
     }
   }
@@ -69,16 +70,18 @@ export default withLayout((props) => {
           settitleLogo(e?.logo || logo)
         })
       })
-    } else {
     }
   }, [roomId, hotelId])
 
   return (
     <view className='page-index'>
+      {/* 引导添加到我的小程序悬浮窗 */}
       <add-tips
         logo={tips}
         custom
         duration={-1} />
+
+
       <view className='index-navbar'>
         <CustomNav logo={titleLogo} title={titleRoom} />
       </view>

src/pages/index/tabs/Recommend.jsx

@@ -71,7 +71,6 @@ export default (props) => {
 
   return (
     <view style={{ height: '100%', overflow: 'hidden', display: 'flex', flexDirection: 'column' }}>
-      <OfficialAccount>s21</OfficialAccount>
       <view className='search' onClick={onSearch} >
         <input className='searchInput' disabled />
         <image className='searchicon' src={iconsearch} />
@@ -110,7 +109,7 @@ export default (props) => {
             <MasonryLayout
               itemKey='resourceNo'
               listData={listData}
-              render={(item, callback) => <Card item={item} onImageLoad={callback} />}
+              render={(item) => <Card item={item} />}
             />
           </view>
         </List>