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

src/components/List/index.jsx

@@ -126,7 +126,6 @@ export default React.forwardRef((props, ref) => {
   useImperativeHandle(ref, () => ({
     context: contextRef.current,
   }))
-
   return (
     <ScrollView
       {...leftProps}

src/hotel/pages/landlord/addRoom/addRoom.jsx

@@ -34,21 +34,29 @@ export default withLayout((props) => {
 
   const onRoomMap = () => {
     Taro.chooseLocation().then((res) => {
-      setRoomModel({ ...roomModel, location: res.longitude + ',' + res.latitude,locName: res.name })
+      setRoomModel({ ...roomModel, location: res.longitude + ',' + res.latitude, locName: res.name })
     })
   }
   
   const onParkMap = () => {
     Taro.chooseLocation().then((res) => {
-      setRoomModel({ ...roomModel, parkingLocation: res.longitude + ',' + res.latitude, pkLocName: res.name  })
+      setRoomModel({ ...roomModel, parkingLocation: res.longitude + ',' + res.latitude, pkLocName: res.name })
     })
   }
   const sumbit = () => {
     if (
+      roomModel.roomName != null &&
       roomModel.roomName != '' &&
+
+      roomModel.address != null &&
       roomModel.address != '' &&
+
+      roomModel.location != null &&
       roomModel.location != '' &&
+
+      roomModel.weight != null &&
       roomModel.weight != ''
+
     ) {
       const seveices = roomId ? updateRoom : saveRoom
       seveices(roomModel, roomId).then(() => {
@@ -193,7 +201,7 @@ export default withLayout((props) => {
               <mp-cell>
                 <View className='roomloc'>
                   <Label style={{ color: '#666', lineHeight: '30px' }} onClick={onRoomMap} >{roomModel.locName || '请选择定位'}</Label>
-                  <Textarea style={{height:'60px',width:'100%'}} onInput={(e) => setRoomModel({ ...roomModel, address: e.detail.value })} value={roomModel.address} placeholder='请输入房屋位置（必填）' />
+                  <Textarea style={{ height: '60px', width: '100%' }} onInput={(e) => setRoomModel({ ...roomModel, address: e.detail.value })} value={roomModel.address} placeholder='请输入房屋位置（必填）' />
                   <Label style={{ display: 'none' }} >{isError(roomModel.location) ? '房间定位（必填）' : roomModel.location}</Label>
                   <Image className='location' src={GPS} onClick={onRoomMap} />
                 </View>
@@ -205,8 +213,8 @@ export default withLayout((props) => {
                   <mp-cell>
                     <View className='roomloc'>
                       <Label style={{ color: '#666', lineHeight: '30px' }} onClick={onParkMap}>{roomModel.pkLocName || '请选择定位'}</Label>
-                      <Textarea  style={{height:'60px',width:'100%'}} onInput={(e) => setRoomModel({ ...roomModel, parkingAddress: e.detail.value })} value={roomModel.parkingAddress} placeholder='请输入停车场位置' />
-                      <Label style={{display: 'none' }}>{isError(roomModel.parkingLocation) ? '停车场定位' : roomModel.parkingLocation}</Label>
+                      <Textarea style={{ height: '60px', width: '100%' }} onInput={(e) => setRoomModel({ ...roomModel, parkingAddress: e.detail.value })} value={roomModel.parkingAddress} placeholder='请输入停车场位置' />
+                      <Label style={{ display: 'none' }}>{isError(roomModel.parkingLocation) ? '停车场定位' : roomModel.parkingLocation}</Label>
                       <Image className='location' src={GPS} onClick={onParkMap} />
                     </View>
                   </mp-cell>