吃个甘蔗嚼一年 3 лет назад
Родитель
Сommit
1ad8fc04e9

+ 30
- 18
src/hotel/pages/components/Extend/style.less Просмотреть файл

@@ -1,28 +1,28 @@
1
-#det{
2
-  .editword{
1
+#det {
2
+  .editword {
3 3
     padding-top: 60px;
4
-    .srl{
4
+    .srl {
5 5
       font-size: 30px;
6 6
       font-weight: bold;
7 7
       color: #202020;
8
-    }  
9
-    .mg{
8
+    }
9
+    .mg {
10 10
       font-size: 38px;
11 11
       margin: 0 20px 50px 20px;
12 12
     }
13
-    .rzline{
13
+    .rzline {
14 14
       border-top: 2px #999 dashed;
15 15
       height: 2px;
16 16
       width: 160px;
17 17
       display: inline-block;
18 18
       margin-bottom: 8px;
19
-    } 
20
-    .cancel{
19
+    }
20
+    .cancel {
21 21
       color: #274290;
22 22
       display: inline-block;
23 23
       margin-right: 44px;
24
-      width: 240px;      
25
-      font-size: 30px;      
24
+      width: 240px;
25
+      font-size: 30px;
26 26
       font-weight: bold;
27 27
       height: 78px;
28 28
       line-height: 78px;
@@ -34,30 +34,42 @@
34 34
       letter-spacing: 3px;
35 35
       width: 240px;
36 36
       height: 78px;
37
-      font-size: 30px;      
37
+      font-size: 30px;
38 38
       line-height: 78px;
39 39
       background: #274290;
40 40
       font-weight: bold;
41 41
       border-radius: 12px;
42 42
       display: inline-block;
43 43
       color: #fff;
44
-    }  
44
+    }
45 45
   }
46
-  .storezn{
46
+  .storezn {
47
+    // color: #202020;
48
+    // line-height: 64px;
49
+    // margin-bottom: 60px;
50
+    // overflow: hidden;
51
+    // text-align: justify;
52
+    // white-space: pre-wrap;
53
+
47 54
     color: #202020;
48
-    line-height: 64px;
49
-    margin-bottom: 60px;
55
+    line-height: 64rpx;
56
+    margin-bottom: 60rpx;
57
+    overflow: hidden;
50 58
     text-align: justify;
59
+    width: 23em;
60
+    padding: 0 21px 0 11px;
61
+    /* padding-right: -12px; */
51 62
     white-space: pre-wrap;
63
+    overflow-wrap: break-word;
52 64
   }
53
-  Textarea{
65
+  Textarea {
54 66
     height: 300px;
55 67
     width: 100%;
56 68
     padding: 30px;
57
-    background: #F8F8F8;
69
+    background: #f8f8f8;
58 70
     border-radius: 8px;
59 71
     box-sizing: border-box;
60 72
     height: 254px;
61 73
     font-size: 26px;
62 74
   }
63
-}
75
+}

+ 5
- 4
src/hotel/pages/landlord/addRoom/addRoom.jsx Просмотреть файл

@@ -34,13 +34,14 @@ export default withLayout((props) => {
34 34
 
35 35
   const onRoomMap = () => {
36 36
     Taro.chooseLocation().then((res) => {
37
-      setRoomModel({ ...roomModel, location: res.longitude + ',' + res.latitude, locName: res.name })
37
+      console.log("🚀 ~ file: addRoom.jsx ~ line 37 ~ Taro.chooseLocation ~ res", res)
38
+      setRoomModel({ ...roomModel, location: res.longitude + ',' + res.latitude, locName: res.name, address: res.address })
38 39
     })
39 40
   }
40
-  
41
+
41 42
   const onParkMap = () => {
42 43
     Taro.chooseLocation().then((res) => {
43
-      setRoomModel({ ...roomModel, parkingLocation: res.longitude + ',' + res.latitude, pkLocName: res.name })
44
+      setRoomModel({ ...roomModel, parkingLocation: res.longitude + ',' + res.latitude, pkLocName: res.name, address: res.address })
44 45
     })
45 46
   }
46 47
   const sumbit = () => {
@@ -174,7 +175,7 @@ export default withLayout((props) => {
174 175
         <CustomNav title={hotelName} />
175 176
       </view>
176 177
       <view className='roomDetail' style={{ height: '100%', overflow: "hidden", }} >
177
-        <scroll-view scrollY style={{ height: '100%' }}>
178
+        <scroll-view scrollY style={{ height: '87%' }}>
178 179
           <View id='det'>
179 180
             <Popup show={showCutover} onClose={onClose}>
180 181
               <View className='editword'>

+ 19
- 6
src/hotel/pages/landlord/addRoom/addRoom.less Просмотреть файл

@@ -56,14 +56,27 @@
56 56
     }
57 57
   }
58 58
   .button-OK {
59
-    height: 92px;
59
+    // height: 92px;
60
+    // background: #274291;
61
+    // margin: 60px 0 30px 0;
62
+    // letter-spacing: 5px;
63
+    // line-height: 92px;
64
+    // border-radius: 12px;
65
+    // font-size: 30px;
66
+    // font-weight: bold;
67
+    // color: #fff;
68
+    /* height: 95rpx; */
69
+
60 70
     background: #274291;
61
-    margin: 60px 0 30px 0;
62
-    letter-spacing: 5px;
63
-    line-height: 92px;
64
-    border-radius: 12px;
65
-    font-size: 30px;
71
+    margin: 60rpx 0 30rpx 0;
72
+    letter-spacing: 5rpx;
73
+    line-height: 92rpx;
74
+    border-radius: 12rpx;
75
+    font-size: 30rpx;
66 76
     font-weight: bold;
67 77
     color: #fff;
78
+    position: fixed;
79
+    top: 37em;
80
+    width: 23em;
68 81
   }
69 82
 }