李志伟 3 yıl önce
ebeveyn
işleme
2409e5ee43

+ 14
- 39
src/pages/index/components/Customized/index.jsx Dosyayı Görüntüle

@@ -1,63 +1,38 @@
1 1
 
2 2
 
3 3
 import Taro from '@tarojs/taro'
4
-import { View } from '@tarojs/components'
4
+import { View, Image } from '@tarojs/components'
5 5
 import { getTravelDestiny } from '@/services/travel'
6
-// import ResultOver from "../../../RandomItinerary/components/ResultOver/index"//结果
7 6
 
8 7
 import './style.less'
9 8
 
10 9
 export default (props) => {
11
-  const { item, onMoldeOn } = props
12
-
13
-
14 10
   const goToTravel = () => {
15 11
     Taro.navigateTo({ url: `/pages/Travel/customizedTravel/index` })
16
-
17 12
   }
18
-
19 13
   //跳转答题页
20 14
   const goToRandomItinerary = () => {
21
-
22 15
     getTravelDestiny().then(e => {
23
-
24 16
       if (!e) {
25 17
         Taro.navigateTo({ url: `/pages/RandomItinerary/index` })
26
-
27 18
       } else {
28 19
         Taro.navigateTo({ url: `/pages/RandomItinerary/ResultOver/index` })
29
-
30 20
       }
31
-
32 21
     })
33
-
34
-
35
-
36
-
37 22
   }
38 23
 
39 24
   return (
40
-    <view style='width:100%;display:flex;'>
41
-      <view style='width:45%'>
42
-        <view onClick={goToTravel} className='CustomizedEntrance'  ></view>
43
-        <image className='MiniYellow' src='https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/GuideCheck/MiniYellow.png' />
44
-
45
-        <image className='BigPink' src='https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/GuideCheck/BigPink.png' />
46
-
47
-      </view>
48
-      <view className='style=width:45%'>
49
-        <view className='BigYellow'  ></view>
50
-
51
-        {/* <view className='MiniPink'  ></view> */}
52
-        <image className='MiniPink' src='https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/GuideCheck/MiniPink.png' />
53
-
54
-
55
-        <view onClick={goToRandomItinerary} className='LtineraryEntrance'  ></view>
56
-
57
-      </view>
58
-    </view>
59
-
60
-
61
-
25
+    <View style='width:100%;display:flex;'>
26
+      <View style='width:45%'>
27
+        <View onClick={goToTravel} className='CustomizedEntrance'  ></View>
28
+        <Image className='MiniYellow' src='https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/GuideCheck/MiniYellow.png' />
29
+        <Image className='BigPink' src='https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/GuideCheck/BigPink.png' />
30
+      </View>
31
+      <View className='style=width:45%'>
32
+        <View className='BigYellow'></View>
33
+        <Image className='MiniPink' src='https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/GuideCheck/MiniPink.png' />
34
+        <View onClick={goToRandomItinerary} className='LtineraryEntrance'></View>
35
+      </View>
36
+    </View>
62 37
   )
63
-}
38
+}

+ 1
- 12
src/pages/index/components/Customized/style.less Dosyayı Görüntüle

@@ -19,10 +19,6 @@
19 19
   position: relative;
20 20
   animation: MiniYellow 2.2s ease infinite;
21 21
   animation-iteration-count: infinite; /*动作循环的次数:infinite 无限循环*/
22
-  // background: url("https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/GuideCheck/MiniYellow.png")
23
-  //   no-repeat;
24
-  // background-size: 100% 100%;
25
-
26 22
   animation-fill-mode: both; /*播放后的状态*/
27 23
   left: 201px;
28 24
   bottom: 20px;
@@ -35,9 +31,6 @@
35 31
   left: 54px;
36 32
   animation: BigPink 2.4s ease infinite;
37 33
   animation-iteration-count: infinite; /*动作循环的次数:infinite 无限循环*/
38
-  // background: url("https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/GuideCheck/BigPink.png")
39
-  //   no-repeat;
40
-  // background-size: 100% 100%;
41 34
   bottom: 10px;
42 35
   animation-fill-mode: both; /*播放后的状态*/
43 36
 }
@@ -66,7 +59,6 @@
66 59
   position: relative;
67 60
   left: 80px;
68 61
   top: 50px;
69
-
70 62
   z-index: -1;
71 63
   animation: BigYellow 2.4s ease infinite;
72 64
   animation-iteration-count: infinite; /*动作循环的次数:infinite 无限循环*/
@@ -81,12 +73,9 @@
81 73
   height: 184px;
82 74
 
83 75
   position: relative;
84
-  left: 0px;
76
+  left: 200px;
85 77
   animation: MiniPink 2.4s ease infinite;
86 78
   animation-iteration-count: infinite; /*动作循环的次数:infinite 无限循环*/
87
-  // background: url("https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/GuideCheck/MiniPink.png")
88
-  //   no-repeat;
89
-  // background-size: 100% 100%;
90 79
   animation-fill-mode: both; /*播放后的状态*/
91 80
 }
92 81
 

+ 71
- 71
src/pages/index/tabs/Guide.jsx Dosyayı Görüntüle

@@ -3,7 +3,7 @@ import Taro, { useDidShow } from '@tarojs/taro'
3 3
 import MoreGuide from "@/components/MoreGuide";
4 4
 import BossCard from '@/components/BossCard'
5 5
 import SpinBox from "@/components/Spin/SpinBox";
6
-import { Image } from "@tarojs/components";
6
+import { Image, View } from "@tarojs/components";
7 7
 import GPS from '@/assets/icons/GuideCheck/GPS.png'
8 8
 import copy_logo from '@/assets/icons/GuideCheck/copy_logo.png'
9 9
 import Cup from '@/assets/icons/GuideCheck/Cup.png'
@@ -133,89 +133,89 @@ export default (props) => {
133 133
     Taro.redirectTo({ url: '/pages/index/index' })
134 134
   }
135 135
   return (
136
-    <scroll-view scrollY style={{ height: '100%' }}  >
137
-      <view className='Guide-Home-box'>
138
-        {/* 有民宿的情况下 */}
139
-        {
140
-          ifroomId === 'reality' && (
141
-            <SpinBox loading={loading}>
142
-              <view className='room-box-info-ROOM'>
143
-                <view className='room-bi-name-ROOM' >
144
-                  <view className='room-bin-title-ROOM'>房屋名称</view>
145
-                  <view className='room-bint-nameInfo-ROOM'>{taRoomContent?.roomName}
136
+      <scroll-view scrollY style={{ height: '100%' }}  >
137
+        <view className='Guide-Home-box'>
138
+          {/* 有民宿的情况下 */}
139
+          {
140
+            ifroomId === 'reality' && (
141
+              <SpinBox loading={loading}>
142
+                <view className='room-box-info-ROOM'>
143
+                  <view className='room-bi-name-ROOM' >
144
+                    <view className='room-bin-title-ROOM'>房屋名称</view>
145
+                    <view className='room-bint-nameInfo-ROOM'>{taRoomContent?.roomName}
146
+                    </view>
146 147
                   </view>
147 148
                 </view>
148
-              </view>
149
-              {/* --------房屋位置-------- */}
150
-              <view className='room-box-info-HouLocation'>
151
-                <view className='room-bi-name-HouLocation' >
152
-                  <view className='room-bin-title-HouLocation'>房屋位置</view>
153
-                  <view className='room-bint-nameInfo-HouLocation'>
154
-                    <view className='room-bint-nameInfo-bool-HouLocation' >{taRoomContent?.address}</view>
155
-                    <view className='room-bintn-button-HouLocation' onClick={() => { goRoomMap() }}>
156
-                      <image className='room-bintn-image-HouLocation' src={GPS} />
157
-                      <text className='room-bintn-text-HouLocation'>去这里</text>
149
+                {/* --------房屋位置-------- */}
150
+                <view className='room-box-info-HouLocation'>
151
+                  <view className='room-bi-name-HouLocation' >
152
+                    <view className='room-bin-title-HouLocation'>房屋位置</view>
153
+                    <view className='room-bint-nameInfo-HouLocation'>
154
+                      <view className='room-bint-nameInfo-bool-HouLocation' >{taRoomContent?.address}</view>
155
+                      <view className='room-bintn-button-HouLocation' onClick={() => { goRoomMap() }}>
156
+                        <image className='room-bintn-image-HouLocation' src={GPS} />
157
+                        <text className='room-bintn-text-HouLocation'>去这里</text>
158
+                      </view>
158 159
                     </view>
159 160
                   </view>
160 161
                 </view>
161
-              </view>
162
-              {/* --------停车场-------- */}
163
-              {
164
-                !taRoomContent.parkingLocation ? null :
165
-                  <view className='room-box-info-Parking'>
166
-                    <view className='room-bi-name-Parking' >
167
-                      <view className='room-bin-title-Parking'>停车位置</view>
168
-                      <view className='room-bint-nameInfo-Parking'>
169
-                        <view className='room-bint-nameInfo-bool-Parking' >{taRoomContent?.parkingAddress}</view>
170
-                        <view className='room-bintn-button-Parking' onClick={() => { goParkMap() }}>
171
-                          <image className='room-bintn-image-Parking' src={GPS} />
172
-                          <text className='room-bintn-text-Parking'>去这里</text>
162
+                {/* --------停车场-------- */}
163
+                {
164
+                  !taRoomContent.parkingLocation ? null :
165
+                    <view className='room-box-info-Parking'>
166
+                      <view className='room-bi-name-Parking' >
167
+                        <view className='room-bin-title-Parking'>停车位置</view>
168
+                        <view className='room-bint-nameInfo-Parking'>
169
+                          <view className='room-bint-nameInfo-bool-Parking' >{taRoomContent?.parkingAddress}</view>
170
+                          <view className='room-bintn-button-Parking' onClick={() => { goParkMap() }}>
171
+                            <image className='room-bintn-image-Parking' src={GPS} />
172
+                            <text className='room-bintn-text-Parking'>去这里</text>
173
+                          </view>
173 174
                         </view>
174 175
                       </view>
175 176
                     </view>
176
-                  </view>
177
-              }
178
-              {/* --------无线网-------- */}
179
-              {
180
-                !taRoomContent.wifiName && !taRoomContent.wifiPassword ? null :
181
-                  <view className='room-box-info-WIFIContent'>
182
-                    <view className='room-bi-name-WIFIContent' >
183
-                      <view className='room-bin-title-WIFIContent'>WiFi信息</view>
184
-                      <view className='room-bint-nameInfo-WIFIContent'>
185
-                        <view className='room-bint-nameInfo-bool-WIFIContent-wifi' >名称:{taRoomContent?.wifiName}</view>
186
-                        <view className='room-bint-nameInfo-bool-WIFIContent-password' >密码:{taRoomContent?.wifiPassword}</view>
187
-                        <view className='room-bintn-button-WIFIContent' onClick={() => { wifiCopy() }}>
188
-                          <image className='room-bintn-image-WIFIContent' src={copy_logo} />
189
-                          <text className='room-bintn-text-WIFIContent'>复制</text>
177
+                }
178
+                {/* --------无线网-------- */}
179
+                {
180
+                  !taRoomContent.wifiName && !taRoomContent.wifiPassword ? null :
181
+                    <view className='room-box-info-WIFIContent'>
182
+                      <view className='room-bi-name-WIFIContent' >
183
+                        <view className='room-bin-title-WIFIContent'>WiFi信息</view>
184
+                        <view className='room-bint-nameInfo-WIFIContent'>
185
+                          <view className='room-bint-nameInfo-bool-WIFIContent-wifi' >名称:{taRoomContent?.wifiName}</view>
186
+                          <view className='room-bint-nameInfo-bool-WIFIContent-password' >密码:{taRoomContent?.wifiPassword}</view>
187
+                          <view className='room-bintn-button-WIFIContent' onClick={() => { wifiCopy() }}>
188
+                            <image className='room-bintn-image-WIFIContent' src={copy_logo} />
189
+                            <text className='room-bintn-text-WIFIContent'>复制</text>
190
+                          </view>
190 191
                         </view>
191 192
                       </view>
192 193
                     </view>
193
-                  </view>
194
-              }
195
-              {
196
-                extend.length === 0 ? null :
197
-                  <view className='Guide-Content-box'  >
198
-                    <view className='title-image'>
199
-                      <image mode='scaleToFill' className='title-image-cup' src={BlackSpot} />
200
-                      <text className='title-title-boss' >更多指引</text>
201
-                    </view>
202
-                    <view>
203
-                      {(extend || []).map((item, index) => <MoreGuide key={(index)} item={item} />)}
194
+                }
195
+                {
196
+                  extend.length === 0 ? null :
197
+                    <view className='Guide-Content-box'  >
198
+                      <view className='title-image'>
199
+                        <image mode='scaleToFill' className='title-image-cup' src={BlackSpot} />
200
+                        <text className='title-title-boss' >更多指引</text>
201
+                      </view>
202
+                      <view>
203
+                        {(extend || []).map((item, index) => <MoreGuide key={(index)} item={item} />)}
204
+                      </view>
204 205
                     </view>
205
-                  </view>
206
-              }
207
-            </SpinBox>
208
-          )
209
-        }
210
-        <view className='Guide-Content-box'>
211
-          <Customized />
212
-        </view>
213
-        <view className={`Guide-bottom-box ${ifroomId === 'reality' ? '' : 'Guide-bottom-two'}`}>
214
-          <Image mode='widthFix' style={{ width: '100%' }} src='http://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/hotel_guide_help.png' onClick={goIndex} />
215
-
206
+                }
207
+              </SpinBox>
208
+            )
209
+          }
210
+          <view className='Guide-Content-box'>
211
+            <Customized />
212
+          </view>
213
+          <view className={`Guide-bottom-box ${ifroomId === 'reality' ? '' : 'Guide-bottom-two'}`}>
214
+            <Image mode='widthFix' style={{ width: '100%' }} src='http://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/hotel_guide_help.png' onClick={goIndex} />
215
+
216
+          </view>
216 217
         </view>
217
-      </view>
218 218
 
219
-    </scroll-view>
219
+      </scroll-view>
220 220
   )
221 221
 }

+ 3
- 9
src/pages/index/tabs/GuideCss/style.less Dosyayı Görüntüle

@@ -1,14 +1,12 @@
1 1
 @whiteColor: #fff;
2 2
 
3 3
 .Guide-Home-box {
4
-  width: 94%;
5
-  margin: auto;
4
+  padding: 30px;
6 5
   .room-box-info-ROOM {
7 6
     display: flex;
8 7
     padding: 10px;
9 8
     .room-bi-name-ROOM {
10 9
       width: 100%;
11
-
12 10
       .room-bin-title-ROOM {
13 11
         margin: 3vw 3vw;
14 12
         color: rgb(125, 125, 125);
@@ -19,7 +17,6 @@
19 17
         -webkit-border-radius: 4em;
20 18
         -moz-border-radius: 4em;
21 19
         border-radius: 40px 40px 40px 40px;
22
-        // border-radius: 2em;
23 20
         font-size: 28px;
24 21
         padding: 1em 3vw;
25 22
         box-shadow: 0px 8px 38px 0px rgba(0, 0, 0, 0.12);
@@ -263,7 +260,6 @@
263 260
   .Guide-Content-box {
264 261
     .title-image {
265 262
       display: flex;
266
-      // width: 270px;
267 263
       height: 40px;
268 264
       padding-bottom: 1em;
269 265
 
@@ -305,14 +301,13 @@
305 301
     }
306 302
   }
307 303
   .Guide-bottom-box {
308
-    width: 100%;
304
+    width: calc(100% - 60px);
309 305
     position: absolute;
310
-    left: 0;
311 306
     z-index: 9999;
312 307
   }
313 308
 
314 309
   .Guide-bottom-two {
315
-    bottom: 0vw;
310
+    bottom: 30px;
316 311
   }
317 312
 
318 313
   //攻略卡片.
@@ -327,7 +322,6 @@
327 322
       width: 330px;
328 323
 
329 324
       .Raiders-image-Raiders {
330
-        // position: absolute;
331 325
         width: 99px;
332 326
         height: 37px;
333 327
       }