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

src/hotel/components/shareRoom/ShareRoom.jsx

@@ -19,19 +19,24 @@ export default (props) => {
     setEndDate(e.detail.value)
   }
   const handelShare = () => {
-    if (roomNum != '' && startDate != '' && endDate != '') {
-      shareRoom({ hotelId: room.hotelId, personNum: roomNum, roomId: room.roomId, startDate: startDate, endDate: endDate }).then((res) => {
-        onFinish(res)
-        setStartDate('')
-        setEndDate('')
-        setRoomNum()
-      })
-    }
+    var myDate = new Date();
+    shareRoom({
+      hotelId: room.hotelId,
+      personNum: roomNum == '' ? 0 : roomNum, roomId: room.roomId,
+      startDate: startDate == '' ? myDate.toLocaleDateString() : startDate,
+      endDate: endDate == '' ? myDate.toLocaleDateString() : endDate
+    }).then((res) => {
+      onFinish(res)
+      setStartDate('')
+      setEndDate('')
+      setRoomNum()
+    })
+
   }
   return (
     <Popup show={showCutover} onClose={onClose}>
       <View className='from-room srl'>
-        <View style={{marginBottom:'25px'}}>
+        <View style={{ marginBottom: '25px' }}>
           <View className='rzline' /><Label className='srl mg'>请输入入住人信息</Label><View className='rzline' />
         </View>
         <View className='srleft'>
@@ -54,57 +59,7 @@ export default (props) => {
           <Button className='cancel' onClick={onClose}>取消</Button>
           <Button className='btn' onClick={handelShare}>分享</Button>
         </View>
-
-
-
-
-        {/* <mp-form  >
-        <Label style={{color:'black'}}>请输入入住人信息</Label>
-        <mp-cells    footer='  ' >
-          <mp-cell title='入住人数：' extClass='font'>
-            <Input focus dataField='nm' onInput={(e) => setRoomNum(e.detail.value)} value={roomNum} type='number' placeholder='请输入入住人数' />
-          </mp-cell>
-          <mp-cell title='入住开始时间：' extClass='font'>
-            <Picker mode='date' onChange={handelStartDate}>
-              {startDate == '' ? '请选择入住开始时间' : startDate}
-            </Picker>
-          </mp-cell>
-          <mp-cell title='入住结束时间：' extClass='font'>
-            <Picker  mode='date' onChange={handelEndDate}>
-            {endDate == '' ? '请选择入住结束时间' : endDate}
-          </Picker>
-          </mp-cell>
-          <mp-cell>
-            <Button className='cancel' onClick={onClose}>取消</Button><Button className='btn' onClick={handelShare}>分享</Button>
-          </mp-cell>
-        </mp-cells>
-      </mp-form> */}
       </View>
-
-
-
-
-
-
-
-      {/* <View className='from-room'>
-        <Label style={{ color: 'black' }}>请输入入住人信息</Label>
-        <View className='flex'>
-          <Label>入住人数：</Label><Input focus dataField='nm' onInput={(e) => setRoomNum(e.detail.value)} value={roomNum} type='number' placeholder='请输入入住人数' /></View>
-        <View className='flex'>
-          <Label>入住开始时间：</Label>
-          <Picker mode='date' className='picker' onChange={handelStartDate}>
-            {startDate == '' ? '请选择入住开始时间' : startDate}
-          </Picker>
-        </View>
-        <View className='flex'>
-          <Label>入住结束时间：</Label>
-          <Picker className='picker' mode='date' onChange={handelEndDate}>
-            {endDate == '' ? '请选择入住结束时间' : endDate}
-          </Picker>
-        </View>
-        <View><Button className='cancel' onClick={onClose}>取消</Button><Button className='btn' onClick={handelShare}>分享</Button></View>
-      </View> */}
     </Popup>
   )
 }

src/pages/index/tabs/Guide.jsx

@@ -88,9 +88,9 @@ export default (props) => {
         setAllextNum(res.total)
         setNewextNum(res.records.length)
       })
-      getRecommendList({ location: RoomLocation }).then((res) => {
-        setPackage(res || [])
-      })
+      // getRecommendList({ location: RoomLocation }).then((res) => {
+      //   setPackage(res || [])
+      // })
 
 
     } else {

src/pages/index/tabs/GuideCss/style.less

@@ -39,7 +39,6 @@
       margin-left: 30px;
 
       .MessageCard-name {
-        width: 400px;
         height: 40px;
         font-size: 32px;
         font-weight: bold;
@@ -50,6 +49,8 @@
         white-space: nowrap;
       }
       .MessageCard-info {
+        display: flex;
+        width: 998em;
         height: 23px;
         font-size: 24px;
         font-weight: 400;
@@ -178,18 +179,24 @@
       margin-left: 30px;
 
       .MessageCard-name-hotle {
-  
-        width: 100%;
-        /* height: 40rpx; */
-        font-size: 32px;
-        font-weight: bold;
-        color: #202020;
-        line-height: 44px;
-        /* overflow: hidden; */
-        /* -o-text-overflow: ellipsis; */
-        text-overflow: ellipsis;
-        /* white-space: nowrap; */
-        display: flex;
+        // width: 100%;
+        // font-size: 32px;
+        // font-weight: bold;
+        // color: #202020;
+        // line-height: 44px;
+        // display: flex;
+
+    font-size: 32px;
+    font-weight: bold;
+    color: #202020;
+    line-height: 44px;
+    display: flex;
+    overflow: hidden;
+    -webkit-line-clamp: 2;
+    text-overflow: ellipsis;
+    -webkit-box-orient: vertical;
+    display: -webkit-box;
+        
       }
       .MessageCard-info-hotle {
         height: 23px;
@@ -209,6 +216,7 @@
       text-align: center;
       display: inline-block;
       left: 1.5em;
+      top: -48px;
       .MessageCard-image-hotle {
         width: 30px;
         height: 30px;