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

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

@@ -1,9 +1,10 @@
 import withLayout from '@/layouts'
 import Taro from '@tarojs/taro'
 import CustomNav from '@/components/CustomNav'
-import { View, Input, Button, Label, Textarea, Text } from '@tarojs/components';
+import { View, Input, Button, Label, Textarea, Text,Image } from '@tarojs/components';
 import { useEffect, useState } from "react"
 import { saveRoom, getRoomDetail, updateRoom } from '@/services/landlord'
+import GPS from '@/assets/icons/GuideCheck/GPS.png'
 import { getExtendContent } from "@/services/home";
 import { saveExtend } from '@/services/landlord'
 //export default是导出模块的   export也是导出模块的    如果引用时不加{}就是引用默认模块加了就是引用相应的模块
@@ -188,16 +189,22 @@ export default withLayout((props) => {
             </mp-cells>
             <mp-cells title='房屋位置'>
               <mp-cell>
-                <Input style={{ color: '#000', fontWeight: 'bold', marginBottom: '13px' }} onInput={(e) => setRoomModel({ ...roomModel, address: e.detail.value })} value={roomModel.address} placeholder='请输入房屋位置（必填）' />
-                <Label style={{ color: '#666' }} onClick={onRoomMap}>{isError(roomModel.location) ? '房间定位（必填）' : roomModel.location}</Label>
+                <View className='roomloc'>
+                <Input style={{ color: '#000', fontWeight: 'bold'}} onInput={(e) => setRoomModel({ ...roomModel, address: e.detail.value })} value={roomModel.address} placeholder='请输入房屋位置（必填）' />
+                <Label style={{display:'none' }} onClick={onRoomMap}>{isError(roomModel.location) ? '房间定位（必填）' : roomModel.location}</Label>
+                <Image className='location' src={GPS} onClick={onRoomMap} />
+                </View>
               </mp-cell>
             </mp-cells>
             {
               paddress != '' ?
                 <mp-cells title='停车场位置'>
                   <mp-cell>
+                  <View className='roomloc'>
                     <Input onInput={(e) => setRoomModel({ ...roomModel, parkingAddress: e.detail.value })} value={roomModel.parkingAddress} placeholder='请输入停车场位置' />
-                    <Label style={{ color: '#666', lineHeight: '30px' }} onClick={onParkMap}>{isError(roomModel.parkingLocation) ? '停车场定位' : roomModel.parkingLocation}</Label>
+                    <Label style={{ color: '#666', lineHeight: '30px',display:'none' }} onClick={onParkMap}>{isError(roomModel.parkingLocation) ? '停车场定位' : roomModel.parkingLocation}</Label>
+                    <Image className='location' src={GPS} onClick={onParkMap} />
+                    </View>
                   </mp-cell>
                 </mp-cells> : null
             }

src/hotel/pages/landlord/addRoom/addRoom.less

@@ -9,7 +9,18 @@
     font-size: 30px;
     margin-top: 40px;
   }
-
+  .roomloc{
+    position: relative;
+    .location{
+      width: 50px;
+      height: 50px;
+      position:absolute;
+      right: 0;
+      top: -2px;
+      z-index: 999;
+    }
+  }
+  
   .adds {
     width: 100%;
     background-color: #fff;