Browse Source

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

李志伟 3 years ago
parent
commit
7e6c656b64

+ 1
- 1
src/hotel/pages/landlord/roomOrder/roomOrder.jsx View File

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

+ 4
- 1
src/pages/index/index.jsx View File

48
     setCurrentTab(index)
48
     setCurrentTab(index)
49
 
49
 
50
     if (index === 1) {
50
     if (index === 1) {
51
+      // 民宿离店消息
51
       withSubscribeMessage([TPL_MESSAGE_HOTEL_CHECK_OUT])
52
       withSubscribeMessage([TPL_MESSAGE_HOTEL_CHECK_OUT])
52
     }
53
     }
53
   }
54
   }
69
           settitleLogo(e?.logo || logo)
70
           settitleLogo(e?.logo || logo)
70
         })
71
         })
71
       })
72
       })
72
-    } else {
73
     }
73
     }
74
   }, [roomId, hotelId])
74
   }, [roomId, hotelId])
75
 
75
 
76
   return (
76
   return (
77
     <view className='page-index'>
77
     <view className='page-index'>
78
+      {/* 引导添加到我的小程序悬浮窗 */}
78
       <add-tips
79
       <add-tips
79
         logo={tips}
80
         logo={tips}
80
         custom
81
         custom
81
         duration={-1} />
82
         duration={-1} />
83
+
84
+
82
       <view className='index-navbar'>
85
       <view className='index-navbar'>
83
         <CustomNav logo={titleLogo} title={titleRoom} />
86
         <CustomNav logo={titleLogo} title={titleRoom} />
84
       </view>
87
       </view>

+ 1
- 2
src/pages/index/tabs/Recommend.jsx View File

71
 
71
 
72
   return (
72
   return (
73
     <view style={{ height: '100%', overflow: 'hidden', display: 'flex', flexDirection: 'column' }}>
73
     <view style={{ height: '100%', overflow: 'hidden', display: 'flex', flexDirection: 'column' }}>
74
-      <OfficialAccount>s21</OfficialAccount>
75
       <view className='search' onClick={onSearch} >
74
       <view className='search' onClick={onSearch} >
76
         <input className='searchInput' disabled />
75
         <input className='searchInput' disabled />
77
         <image className='searchicon' src={iconsearch} />
76
         <image className='searchicon' src={iconsearch} />
110
             <MasonryLayout
109
             <MasonryLayout
111
               itemKey='resourceNo'
110
               itemKey='resourceNo'
112
               listData={listData}
111
               listData={listData}
113
-              render={(item, callback) => <Card item={item} onImageLoad={callback} />}
112
+              render={(item) => <Card item={item} />}
114
             />
113
             />
115
           </view>
114
           </view>
116
         </List>
115
         </List>