李志伟 3 år sedan
förälder
incheckning
9a5779097d

+ 171
- 171
src/pages/details/foodDetails/foodDetails.jsx Visa fil

@@ -8,19 +8,19 @@ import baixin from '../../../assets/icons/housemantj/收藏.png'
8 8
 import yysj from '../../../assets/icons/housemantj/营业时间.png'
9 9
 import dw from '../../../assets/icons/housemantj/地址.png'
10 10
 import zhuandao from '../../../assets/icons/housemantj/backTop.png'
11
-import titlezs  from '../../../assets/icons/housemantj/标题装饰.png'
12
-import pay  from '../../../assets/icons/housemantj/pay.png'
13
-import ms2  from '../../../assets/icons/housemantj/ms2.jpg'
14
-import msTip from'../../../assets/icons/housemantj/foodtip.png'
15
-import wz from'../../../assets/icons/housemantj/location.png'
16
-import showMore from'../../../assets/icons/housemantj/查看更多.png'
17
-import dp from'../../../assets/icons/housemantj/dp.jpg'
18
-import znz from'../../../assets/icons/housemantj/znz.png'
11
+import titlezs from '../../../assets/icons/housemantj/标题装饰.png'
12
+import pay from '../../../assets/icons/housemantj/pay.png'
13
+import ms2 from '../../../assets/icons/housemantj/ms2.jpg'
14
+import msTip from '../../../assets/icons/housemantj/foodtip.png'
15
+import wz from '../../../assets/icons/housemantj/location.png'
16
+import showMore from '../../../assets/icons/housemantj/查看更多.png'
17
+import dp from '../../../assets/icons/housemantj/dp.jpg'
18
+import znz from '../../../assets/icons/housemantj/znz.png'
19 19
 import location from '../../../assets/icons/housemantj/location.png'
20
-import mjImage from'../../../assets/icons/housemantj/mj.jpg'
21
-import glImage from'../../../assets/icons/housemantj/gl.jpg'
22
-import glTip from'../../../assets/icons/housemantj/gltip.png'
23
-import onlove from'../../../assets/icons/housemantj/爱心.png'
20
+import mjImage from '../../../assets/icons/housemantj/mj.jpg'
21
+import glImage from '../../../assets/icons/housemantj/gl.jpg'
22
+import glTip from '../../../assets/icons/housemantj/gltip.png'
23
+import onlove from '../../../assets/icons/housemantj/爱心.png'
24 24
 import './foodDetails.less'
25 25
 
26 26
 
@@ -30,56 +30,56 @@ export default (props) => {
30 30
       <view className='index-navbar'>
31 31
         <CustomNav title='十公里' />
32 32
       </view>
33
-      <view style={{height: '100%',overflow:'auto', padding: '0 30rpx', background: '#F8F8F8' }}>
34
-          <scroll-view  scroll-y="true" scroll-view='true' bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll" className='content'>
35
-            <view className='storeDetails'>
36
-          <image src={fd} className='storeImage' >
37
-            <view className='tpPage'>
38
-              <text>1</text>/<text>64</text>
39
-            </view>
40
-          </image>
41
-          <view className='storeJs'>
42
-            <view style={{overflow:'hidden'}}>
43
-            <view className='introduce'>
44
-              <text className='storeName'>clip coffee</text>
45
-            <text>¥</text><text className='price'><text>88</text>/人</text>            
46
-            </view>
47
-            <view className='bz'>
48
-              <image src={ax} style={{width:'13rpx',height:'13rpx',marginRight:'11rpx',marginBottom:'-2rpx'}}/>
49
-              <text className='bzRight'>爆赞<text>9999+</text></text>
50
-            </view>
51
-            </view>
52
-            <view className='appraise'>
53
-              <image className='star' src={huangxin}></image>
54
-              <image className='star' src={huangxin}></image>
55
-              <image className='star' src={huangxin}></image>
56
-              <image className='star' src={huangxin}></image>
57
-              <image className='star' src={baixin}></image>
58
-              <text className='storezf'>4.5</text>
59
-              <text className='comment'>点评:</text>
60
-              <text>口味:</text>
61
-              <text className='flavor'>4</text>
62
-              <text>环境:</text>
63
-              <text className='storehj'>3</text>
64
-              <text>服务</text>
65
-              <text className='service'>4.5</text>
66
-            </view>
67
-            <view className='yysj'>
68
-              <image src={yysj} className='yysjImg'/>
69
-              <text>营业时间:周一至周日 06:00-20:00</text>
70
-            </view>
71
-            <view className='dpPosition'>
72
-              <image src={dw} className='dwTip'/>
73
-              <view>
74
-                <text>马道街夫子庙老门东小吃街三条营47号(地铁
75
-                3号线武定门3号口步行8分钟)
76
-                </text>
77
-                <image src={zhuandao} className='zhuandao'/>
33
+      <view style={{overflow: 'auto', padding: '0 30rpx', background: '#F8F8F8' }}>
34
+        <scroll-view scroll-y="true" scroll-view='true' bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll">
35
+          <view className='storeDetails'>
36
+            <image src={fd} className='storeImage' >
37
+              <view className='tpPage'>
38
+                <text>1</text><text>/</text><text>64</text>
39
+              </view>
40
+            </image>
41
+            <view className='storeJs'>
42
+              <view style={{ overflow: 'hidden' }}>
43
+                <view className='introduce'>
44
+                  <text className='storeName'>clip coffee</text>
45
+                  <text>¥</text><text className='price'><text>88</text>/人</text>
46
+                </view>
47
+                <view className='bz'>
48
+                  <image src={ax} style={{ width: '15px', height: '15px', marginRight: '11rpx', marginBottom: '-2px' }} />
49
+                  <text className='bzRight'>爆赞<text>9999+</text></text>
50
+                </view>
51
+              </view>
52
+              <view className='appraise'>
53
+                <image className='star' src={huangxin}></image>
54
+                <image className='star' src={huangxin}></image>
55
+                <image className='star' src={huangxin}></image>
56
+                <image className='star' src={huangxin}></image>
57
+                <image className='star' src={baixin}></image>
58
+                <text className='storezf'>4.5</text>
59
+                <view style={{float:'right',marginTop:'5px'}}>
60
+                  <text className='comment'>点评:</text>
61
+                  <text className='t1'>口味:</text>
62
+                  <text className='flavor'>4</text>
63
+                  <text className='t1'>环境:</text>
64
+                  <text className='storehj'>3</text>
65
+                  <text className='t1'>服务</text>
66
+                  <text className='service'>4.5</text>
67
+                </view>
68
+              </view>
69
+              <view className='yysj'>
70
+                <image src={yysj} className='yysjImg' />
71
+                <text>营业时间:周一至周日 06:00-20:00</text>
72
+              </view>
73
+              <view className='dpPosition'>
74
+                <image src={dw} className='dwTip' />
75
+                <view>
76
+                  <text>马道街夫子庙老门东小吃街三条营47号(地铁3号线武定门3号口步行8分钟)</text>
77
+                  <image src={zhuandao} className='zhuandao' />
78 78
                 </view>
79
+              </view>
79 80
             </view>
80 81
           </view>
81
-        </view>
82
-            <view style={{position:'relative'}}>
82
+          <view style={{ position: 'relative' }}>
83 83
             <view className='title'>
84 84
               <image src={titlezs}></image>
85 85
               <text>返现套餐</text>
@@ -95,33 +95,33 @@ export default (props) => {
95 95
                   <image className='star' src={huangxin}></image>
96 96
                   <image className='star' src={huangxin}></image>
97 97
                   <image className='star' src={baixin}></image>
98
-                <text className='storezf'>4.5</text>
99
-            </view>
100
-                <view style={{overflow:'hidden'}}>
101
-                <view className='contentImg'>
102
-                  <image src={ms2} className='img1' ></image>
103
-                  <image src={msTip}  className='mstip'></image>
98
+                  <text className='storezf'>4.5</text>
104 99
                 </view>
105
-                <view className='neirong'>
106
-                  <view className='textword'>
107
-                  探店拥有“蓝色波浪”的咖啡店连手提袋都很特别手绘的...
108
-                  </view>
109
-                  <view className='jiage'>
110
-                    <text className='rmb' >¥&nbsp;&nbsp;</text>
111
-                    <text className='p1'><text className='price' >55</text>元&nbsp;&nbsp;</text>
112
-                    <text className='p2'>门市价<text className='oldprice' >78</text>元</text>
100
+                <view>
101
+                  <view className='contentImg'>
102
+                    <image src={ms2} className='img1' ></image>
103
+                    <image src={msTip} className='mstip'></image>
113 104
                   </view>
114
-                  <view className='address'>
115
-                    <image className='dw' src={wz} />
116
-                    <text className='wz'>南京市/秦淮区</text>
117
-                    <image className='star' src={huangxin}></image>
118
-                    <text className='collection'>已收藏</text>
105
+                  <view className='neirong'>
106
+                    <view className='textword'>
107
+                      探店拥有“蓝色波浪”的咖啡店连手提袋都很特别手绘的...
108
+                    </view>
109
+                    <view className='jiage'>
110
+                      <text className='rmb' >¥&nbsp;&nbsp;</text>
111
+                      <text className='p1'><text className='price' >55</text>元&nbsp;&nbsp;</text>
112
+                      <text className='p2'>门市价<text className='oldprice' >78</text>元</text>
113
+                    </view>
114
+                    <view className='address'>
115
+                      <image className='dw' src={wz} />
116
+                      <text className='wz'>南京市/秦淮区</text>
117
+                      <image className='star' src={huangxin}></image>
118
+                      <text className='collection'>已收藏</text>
119
+                    </view>
119 120
                   </view>
120 121
                 </view>
121
-                </view>
122 122
               </view>
123 123
               <view className='fCright'>
124
-                <image src={pay}/>
124
+                <image src={pay} />
125 125
                 <view>支付</view>
126 126
               </view>
127 127
               <view className='circleTop'></view>
@@ -139,33 +139,33 @@ export default (props) => {
139 139
                   <image className='star' src={huangxin}></image>
140 140
                   <image className='star' src={huangxin}></image>
141 141
                   <image className='star' src={baixin}></image>
142
-                <text className='storezf'>4.5</text>
143
-            </view>
144
-                <view style={{overflow:'hidden'}}>
145
-                <view className='contentImg'>
146
-                  <image src={ms2} className='img1' ></image>
147
-                  <image src={msTip}  className='mstip'></image>
142
+                  <text className='storezf'>4.5</text>
148 143
                 </view>
149
-                <view className='neirong'>
150
-                  <view className='textword'>
151
-                  探店拥有“蓝色波浪”的咖啡店连手提袋都很特别手绘的...
144
+                <view style={{ overflow: 'hidden' }}>
145
+                  <view className='contentImg'>
146
+                    <image src={ms2} className='img1' ></image>
147
+                    <image src={msTip} className='mstip'></image>
152 148
                   </view>
153
-                  <view className='jiage'>
154
-                    <text className='rmb' >¥&nbsp;&nbsp;</text>
155
-                    <text className='p1'><text className='price' >55</text>元&nbsp;&nbsp;</text>
156
-                    <text className='p2'>门市价<text className='oldprice' >78</text>元</text>
149
+                  <view className='neirong'>
150
+                    <view className='textword'>
151
+                      探店拥有“蓝色波浪”的咖啡店连手提袋都很特别手绘的...
152
+                    </view>
153
+                    <view className='jiage'>
154
+                      <text className='rmb' >¥&nbsp;&nbsp;</text>
155
+                      <text className='p1'><text className='price' >55</text>元&nbsp;&nbsp;</text>
156
+                      <text className='p2'>门市价<text className='oldprice' >78</text>元</text>
157
+                    </view>
158
+                    <view className='address'>
159
+                      <image className='dw' src={wz} />
160
+                      <text className='wz'>南京市/秦淮区</text>
161
+                      <image className='star' src={huangxin}></image>
162
+                      <text className='collection'>已收藏</text>
163
+                    </view>
157 164
                   </view>
158
-                  <view className='address'>
159
-                    <image className='dw' src={wz} />
160
-                    <text className='wz'>南京市/秦淮区</text>
161
-                    <image className='star' src={huangxin}></image>
162
-                    <text className='collection'>已收藏</text>
163
-                  </view>
164
-                </view>
165 165
                 </view>
166 166
               </view>
167 167
               <view className='fCright'>
168
-                <image src={pay}/>
168
+                <image src={pay} />
169 169
                 <view>支付</view>
170 170
               </view>
171 171
               <view className='circleTop'></view>
@@ -175,28 +175,28 @@ export default (props) => {
175 175
             <view className='showMore'>
176 176
               <view>查看更多</view>
177 177
               <image src={showMore} className='moreTip' />
178
-            </view>          
179 178
             </view>
179
+          </view>
180 180
 
181
-            <view style={{position:'relative'}}>
181
+          <view style={{ position: 'relative' }}>
182 182
             <view className='title'>
183 183
               <image src={titlezs}></image>
184 184
               <text>本店指南</text>
185 185
             </view>
186 186
             <view className='storezn'>
187
-            Lorem ipsum dolor sit amet, consectetur adipiscing elit,
188
-             sed do eiusmod tempor incididunt ut labore et dolore 
189
-             magna aliqua. Quis ipsum suspendisse ultrices gravida.
190
-              Risus commodo viverra maecenas accumsan lacus vel 
191
-              facilisis. 
187
+              Lorem ipsum dolor sit amet, consectetur adipiscing elit,
188
+              sed do eiusmod tempor incididunt ut labore et dolore
189
+              magna aliqua. Quis ipsum suspendisse ultrices gravida.
190
+              Risus commodo viverra maecenas accumsan lacus vel
191
+              facilisis.
192 192
             </view>
193
-            <image src={dp} mode='widthFix'/>
193
+            <image src={dp} mode='widthFix' />
194 194
             <view className='storezn'>
195
-            Lorem ipsum dolor sit amet, consectetur adipiscing elit,
196
-             sed do eiusmod tempor incididunt ut labore et dolore 
197
-             magna aliqua. Quis ipsum suspendisse ultrices gravida.
198
-              Risus commodo viverra maecenas accumsan lacus vel 
199
-              facilisis. 
195
+              Lorem ipsum dolor sit amet, consectetur adipiscing elit,
196
+              sed do eiusmod tempor incididunt ut labore et dolore
197
+              magna aliqua. Quis ipsum suspendisse ultrices gravida.
198
+              Risus commodo viverra maecenas accumsan lacus vel
199
+              facilisis.
200 200
             </view>
201 201
             <view className='foodCard'>
202 202
               <view className='fCleft'>
@@ -209,33 +209,33 @@ export default (props) => {
209 209
                   <image className='star' src={huangxin}></image>
210 210
                   <image className='star' src={huangxin}></image>
211 211
                   <image className='star' src={baixin}></image>
212
-                <text className='storezf'>4.5</text>
213
-            </view>
214
-                <view style={{overflow:'hidden'}}>
215
-                <view className='contentImg'>
216
-                  <image src={ms2} className='img1' ></image>
217
-                  <image src={msTip}  className='mstip'></image>
212
+                  <text className='storezf'>4.5</text>
218 213
                 </view>
219
-                <view className='neirong'>
220
-                  <view className='textword'>
221
-                  探店拥有“蓝色波浪”的咖啡店连手提袋都很特别手绘的...
222
-                  </view>
223
-                  <view className='jiage'>
224
-                    <text className='rmb' >¥&nbsp;&nbsp;</text>
225
-                    <text className='p1'><text className='price' >55</text>元&nbsp;&nbsp;</text>
226
-                    <text className='p2'>门市价<text className='oldprice' >78</text>元</text>
214
+                <view style={{ overflow: 'hidden' }}>
215
+                  <view className='contentImg'>
216
+                    <image src={ms2} className='img1' ></image>
217
+                    <image src={msTip} className='mstip'></image>
227 218
                   </view>
228
-                  <view className='address'>
229
-                    <image className='dw' src={wz} />
230
-                    <text className='wz'>南京市/秦淮区</text>
231
-                    <image className='star' src={huangxin}></image>
232
-                    <text className='collection'>已收藏</text>
219
+                  <view className='neirong'>
220
+                    <view className='textword'>
221
+                      探店拥有“蓝色波浪”的咖啡店连手提袋都很特别手绘的...
222
+                    </view>
223
+                    <view className='jiage'>
224
+                      <text className='rmb' >¥&nbsp;&nbsp;</text>
225
+                      <text className='p1'><text className='price' >55</text>元&nbsp;&nbsp;</text>
226
+                      <text className='p2'>门市价<text className='oldprice' >78</text>元</text>
227
+                    </view>
228
+                    <view className='address'>
229
+                      <image className='dw' src={wz} />
230
+                      <text className='wz'>南京市/秦淮区</text>
231
+                      <image className='star' src={huangxin}></image>
232
+                      <text className='collection'>已收藏</text>
233
+                    </view>
233 234
                   </view>
234 235
                 </view>
235
-                </view>
236 236
               </view>
237 237
               <view className='fCright'>
238
-                <image src={pay}/>
238
+                <image src={pay} />
239 239
                 <view>支付</view>
240 240
               </view>
241 241
               <view className='circleTop'></view>
@@ -243,47 +243,47 @@ export default (props) => {
243 243
               <view className='columnLine'></view>
244 244
             </view>
245 245
             <view className='storezn'>
246
-            Lorem ipsum dolor sit amet, consectetur adipiscing elit,
247
-             sed do eiusmod tempor incididunt ut labore et dolore 
248
-             magna aliqua. Quis ipsum suspendisse ultrices gravida. 
249
-            </view>            
246
+              Lorem ipsum dolor sit amet, consectetur adipiscing elit,
247
+              sed do eiusmod tempor incididunt ut labore et dolore
248
+              magna aliqua. Quis ipsum suspendisse ultrices gravida.
249
+            </view>
250 250
             <view className='showMore'>
251 251
               <view>查看更多</view>
252 252
               <image src={showMore} className='moreTip' />
253
-            </view>          
254
-            </view>
255
-            
256
-            <view className='title'>
257
-              <image src={znz} className='gltitle'></image>
258
-              <text>老板推荐的攻略</text>
259 253
             </view>
260
-            
261
-            
262
-              <view className="waterfall">
263
-                <view className='contentCard'>
264
-                <view className='cardTop'>
265
-                  <image mode='widthFix' src={mjImage} className='cCardimg'/>
266
-                  <image  className='lefttips' src={glTip} />
267
-                  <image src={onlove} className='loveharde'></image>
254
+          </view>
255
+
256
+          <view className='title'>
257
+            <image src={znz} className='gltitle'></image>
258
+            <text>老板推荐的攻略</text>
259
+          </view>
260
+
261
+
262
+          <view className="waterfall">
263
+            <view className='contentCard'>
264
+              <view className='cardTop'>
265
+                <image mode='widthFix' src={mjImage} className='cCardimg' />
266
+                <image className='lefttips' src={glTip} />
267
+                <image src={onlove} className='loveharde'></image>
268
+              </view>
269
+              <view className='bContent'>
270
+                <view className='cCword'>
271
+                  超划算套餐?这么便宜也是第一次见6荤6素1...
268 272
                 </view>
269
-                <view className='bContent'>
270
-                  <view className='cCword'>
271
-                    超划算套餐?这么便宜也是第一次见6荤6素1...
272
-                  </view>
273
-                  <view className='cCleft'>
274
-                    <image src={location} className='cCicon'></image>
275
-                    <view className='distance'><text>9.99</text>公里</view>
276
-                  </view>
277
-                  <view className='cCright'>
278
-                    <view className='money'>¥</view>
279
-                    <view className='price'><text>999</text>/人</view>
280
-                  </view>
273
+                <view className='cCleft'>
274
+                  <image src={location} className='cCicon'></image>
275
+                  <view className='distance'><text>9.99</text>公里</view>
276
+                </view>
277
+                <view className='cCright'>
278
+                  <view className='money'>¥</view>
279
+                  <view className='price'><text>999</text>/人</view>
281 280
                 </view>
282 281
               </view>
283
-                <view className='contentCard'>
282
+            </view>
283
+            <view className='contentCard'>
284 284
               <view className='cardTop'>
285
-                <image mode='widthFix' src={glImage} className='cCardimg'/>
286
-                <image  className='lefttips' src={glTip} />
285
+                <image mode='widthFix' src={glImage} className='cCardimg' />
286
+                <image className='lefttips' src={glTip} />
287 287
                 <image src={onlove} className='loveharde'></image>
288 288
               </view>
289 289
               <view className='bContent'>
@@ -300,9 +300,9 @@ export default (props) => {
300 300
                 </view>
301 301
               </view>
302 302
             </view>
303
-              </view>
304
-            <view className='botton'>已经到底了~</view>
305
-          </scroll-view>
303
+          </view>
304
+          <view className='botton'>已经到底了~</view>
305
+        </scroll-view>
306 306
       </view>
307 307
     </view>
308 308
   )

+ 275
- 308
src/pages/details/foodDetails/foodDetails.less Visa fil

@@ -5,48 +5,41 @@
5 5
     position: relative;
6 6
     border-radius: 22px;
7 7
     width: 100%;
8
-      .tpPage{
8
+    .tpPage{
9 9
       position: absolute;
10 10
       right: 20px;
11 11
       bottom: 20px;
12
-      width: 60px;
13 12
       background: #000000;
14 13
       border-radius: 16px;  
15
-      font-size: 24px;
16
-       
17
-          color: #FFFFFF;
14
+      font-size: 24px;       
15
+      color: #FFFFFF;
18 16
       padding:0 7px;
19
-      text-align: center;
20 17
       opacity: 0.4;  
18
+      line-height: 32px;
19
+      padding: 7px 8px 8px 7px;
21 20
       text{
22 21
         opacity: 0.64;
23 22
       }
24 23
     }
25
-  }
26
-  
24
+  }  
27 25
   .storeJs{
28 26
     padding: 20px;
29 27
     .introduce{
30 28
       float: left;
31 29
       .storeName{
32
-        font-size: 32px;
33
-         
30
+        font-size: 32px;         
34 31
         font-weight: bold;
35 32
         color: #020200;
36 33
         padding-right: 60px;
37 34
       }
38 35
       .storeName+text{
39
-        width: 12px;
40
-        height: 17px;
41
-        font-size: 24px;
42
-         
36
+        font-size: 24px;         
43 37
         font-weight: bold;
44 38
         color: #202020;
45 39
         padding-right: 10px;
46 40
       }
47 41
       .price{
48
-        font-size: 32px;
49
-         
42
+        font-size: 32px;         
50 43
         font-weight: bold;
51 44
         color: #202020;
52 45
       }
@@ -54,35 +47,39 @@
54 47
     .bz{
55 48
       float: right;
56 49
       .bzRight{
57
-        font-size: 24px;
58
-         
59
-              color: #202020;
50
+        font-size: 24px;         
51
+        color: #202020;
60 52
         line-height: 34px;
61 53
         height: 23px;
62 54
       }
63 55
     }
64 56
     .appraise{
57
+      line-height: 0;
58
+      margin-top: 28px;
59
+      margin-bottom: 37px;
65 60
       image{
66 61
         width: 24px;
67 62
         height: 24px;
68 63
         margin-right: 10px;
69 64
       }
70 65
       text{
71
-        font-size: 24px;
72
-         
66
+        font-size: 24px;         
73 67
         font-weight: bold;
74 68
         color: #020200;
75 69
       }
70
+      .t1{
71
+        margin-left: 10px;
72
+      }
76 73
       .storezf{
77
-        height: 17px;
78 74
         color: #020200;
79
-        margin:0 24px 0 0 ;
75
+        margin-left: 7px ;
80 76
       }
81 77
       .comment{
82 78
         color: #666;
83 79
       }
84 80
     }
85 81
     .yysj{
82
+      line-height: 0;
86 83
       .yysjImg{
87 84
         width: 26px;
88 85
         height: 26px;
@@ -91,8 +88,7 @@
91 88
       }
92 89
       text{
93 90
         font-size: 24px;
94
-         
95
-              color: #666666;
91
+        color: #666;
96 92
         padding-left: 10px;
97 93
       }
98 94
     }
@@ -107,334 +103,305 @@
107 103
         left:0;
108 104
       }
109 105
       view{
110
-        font-size: 24px;
111
-         
112
-              color: #666666;
113
-        line-height: 44px;
106
+        font-size: 24px;         
107
+        color: #666666;
114 108
         padding-left: 34px;
109
+        height: 97px;
115 110
         .zhuandao{
116 111
           width: 14px;
117 112
           height: 24px;
118 113
           transform: rotate(180deg);
119 114
           position: absolute;
120
-          bottom: 10px;
115
+          bottom: 25px;
121 116
         }        
122 117
       }
123 118
       
124 119
     }
125 120
   }
126 121
 }
127
-
128
-.content{
129
-  width: 100%;
130
-  height: calc(100vh - 120px);
131
-  .title{
132
-    margin: 60px 0 40px 0;
133
-    image{
134
-      width: 30px;
135
-      height: 30px;
136
-      position: relative;
137
-      top: 5px;
138
-    }
139
-    text{
140
-      font-size: 34px;
141
-       
122
+.title{
123
+  margin: 59px 0 41px 0;
124
+  image{
125
+    width: 30px;
126
+    height: 30px;
127
+    position: relative;
128
+    top: 5px;
129
+  }
130
+  text{
131
+    font-size: 34px;       
132
+    font-weight: bold;
133
+    color: #202020;
134
+    margin-left: 10px;
135
+  }
136
+  .gltitle{
137
+    width: 32px;
138
+    height: 32px;
139
+    position: relative;
140
+    top: 5px;
141
+  }
142
+}
143
+.foodCard{
144
+  background: #FFFFFF;
145
+  box-shadow: 0px 8px 38px 0px rgba(0, 0, 0, 0.12);
146
+  border-radius: 12px;
147
+  position: relative;
148
+  margin-bottom: 30px;
149
+  overflow: hidden;
150
+  .fCleft{
151
+    float: left;
152
+    width: 82%;
153
+    .backMoney{
154
+      font-size: 24px;
142 155
       font-weight: bold;
143
-      color: #202020;
144
-      margin-left: 10px;
156
+      color: #FFF;
157
+      margin: 22px 40px 20px 0;        
158
+      padding: 12px 17px 9px 6px;
159
+      background:url('../../../assets/icons/housemantj/fximg.png') no-repeat;    
160
+      display: inline-block;
161
+      background-size: 100% 100%;
162
+    }
163
+    .appraise{
164
+      display: inline-block;
165
+      image{
166
+        width: 21px;
167
+        height: 21px;
168
+        margin-right: 10px;
169
+      }
170
+      text{
171
+        font-size: 24px;           
172
+        font-weight: bold;
173
+        color: #020200;
174
+      }
145 175
     }
146
-    .gltitle{
147
-      width: 32px;
148
-      height: 32px;
176
+    .contentImg{
177
+      margin: 0 20px 43px 20px;
149 178
       position: relative;
150
-      top: 5px;
179
+      display: inline-block;
180
+      .img1{
181
+        width: 144px;
182
+        height: 144px;
183
+        border-radius: 24px;
184
+      }
185
+      .mstip{
186
+          width:99px;
187
+          height:37px;
188
+          position: absolute;
189
+          left: 0;          
190
+      }
151 191
     }
152
-  }
153
-
154
-  .foodCard{
155
-    background: #FFFFFF;
156
-    box-shadow: 0px 8px 38px 0px rgba(0, 0, 0, 0.12);
157
-    border-radius: 12px;
158
-    position: relative;
159
-    margin-bottom: 30px;
160
-    overflow: hidden;
161
-    .fCleft{
162
-      float: left;
163
-      width: 82%;
164
-      height: 100%;
165
-      .backMoney{
166
-        font-size: 24px;
167
-        font-family: PingFang SC;
168
-        font-weight: bold;
169
-        color: #FFFFFF;
170
-        margin: 22px 40px 30px 0;        
171
-        display: block;
172
-        padding: 12px 17px 9px 6px;
173
-        background:url('../../../assets/icons/housemantj/fximg.png') no-repeat;    
174
-        display: inline-block;
175
-        background-size: 100% 100%;
192
+    .neirong{
193
+      display: inline-block;
194
+      width: 65%;
195
+      .textword{
196
+        font-size: 24px;           
197
+        color: #333;
198
+        margin: 0 21px 0 0;
199
+        height: 84px;
176 200
       }
177
-      .appraise{
178
-        display: inline-block;
179
-        image{
180
-          width: 24px;
181
-          height: 24px;
182
-          margin-right: 10px;
201
+      .jiage{
202
+        line-height: 20px;
203
+        font-weight: bold;
204
+        color: #333;
205
+        .rmb{
206
+          font-size: 20px;             
207
+          margin: 0 8px 0 7px;
183 208
         }
184
-        text{
185
-          font-size: 24px;
186
-           
187
-          font-weight: bold;
188
-          color: #020200;
209
+        .p1{
210
+          font-size: 24px;     
189 211
         }
190
-      }
191
-      .contentImg{
192
-        margin: 0 0 43px 20px;
193
-        position: relative;
194
-        float: left;
195
-        .img1{
196
-          width: 144px;
197
-          height: 144px;
198
-          border-radius: 24px;
199
-        }
200
-        .mstip{
201
-            width:99px;
202
-            height:37px;
203
-            position: absolute;
204
-            left: 0;          
212
+        .p2{
213
+          font-size: 18px;             
214
+          text-decoration: line-through;
215
+          color: #666;
205 216
         }
206 217
       }
207
-      .neirong{
208
-        float: right;
209
-        width: 65%;
210
-        .textword{
211
-          font-size: 24px;
212
-           
213
-                  color: #333333;
214
-          margin: 0 21px 0 0;
218
+      .address{
219
+        line-height: 0;
220
+        margin-top: 18px;
221
+        .dw{
222
+          width: 16px;
223
+          height: 20px;
224
+          position: relative;
225
+          top:3px;
226
+          margin-right: 10px;
215 227
         }
216
-        .jiage{
217
-          .rmb{
218
-            font-size: 20px;
219
-             
220
-            font-weight: bold;
221
-            color: #333333;
222
-          }
223
-          .p1{
224
-            font-size: 24px;
225
-             
226
-            font-weight: bold;
227
-            color: #333333;
228
-          }
229
-          .p2{
230
-            font-size: 18px;
231
-             
232
-                      text-decoration: line-through;
233
-            color: #666666;
234
-          }
228
+        .wz{
229
+          font-size: 20px;             
230
+          color: #333;
235 231
         }
236
-        .address{
237
-          line-height: 10px;
238
-          .dw{
239
-            width: 16px;
240
-            height: 20px;
241
-            position: relative;
242
-            top:3px;
243
-            margin-right: 10px;
244
-          }
245
-          .wz{
246
-            font-size: 20px;
247
-             
248
-                      color: #333333;
249
-          }
250
-          .star{
251
-            width: 21px;
252
-            height: 21px;
253
-            margin: 0 10px 0 30px;
254
-            position: relative;
255
-            top: 3px;
256
-          }
257
-          .collection{
258
-            font-size: 20px;
259
-             
260
-                      color: #333333;
261
-          }
232
+        .star{
233
+          width: 21px;
234
+          height: 21px;
235
+          margin: 0 10px 0 40px;
236
+          position: relative;
237
+          top: 3px;
238
+        }
239
+        .collection{
240
+          font-size: 20px;             
241
+          color: #333333;
262 242
         }
263 243
       }
264 244
     }
265
-    .fCright{
266
-      float: right;
267
-      width: 18%;
268
-      height: 100%;
269
-      image{
270
-        width: 35px;
271
-        height:32px;
272
-        margin-top: 135%;
273
-        margin-left:calc(50% - 15px)
274
-      }
275
-      view{
276
-        font-size: 24px;
277
-         
278
-        font-weight: bold;
279
-        color: #202020;
280
-        text-align: center;
281
-      }
282
-    }
283
-    .circleTop{
284
-      width: 30px;
285
-      height: 16px;
286
-      border-radius: 15px 15px 0 0;
287
-      background-color: #F8F8F8;
288
-      position: absolute;
289
-      bottom: 0;
290
-      right: 16%;
291
-      
292
-    }
293
-    .circleBottom{
294
-      width: 30px;
295
-      height: 16px;
296
-      border-radius:0 0 15px 15px;
297
-      background-color: #F8F8F8;
298
-      position: absolute;
299
-      top: 0;
300
-      right: 16%;
301
-      
245
+  }
246
+  .fCright{
247
+    float: right;
248
+    width: 18%;
249
+    line-height: 0;
250
+    image{
251
+      width: 35px;
252
+      height:32px;
253
+      margin-top: 135%;
254
+      margin-left:calc(50% - 15px)
302 255
     }
303
-    .columnLine{
304
-      height: 50%;
305
-      border-right: 5px dashed #595959;
306
-      opacity: 0.12;
307
-      position: absolute;
308
-      right: 18%;
309
-      bottom:15%;
256
+    view{
257
+      font-size: 24px;
258
+      line-height: 23px;
259
+      font-weight: bold;
260
+      color: #202020;
261
+      margin-top: 19px;
262
+      text-align: center;
310 263
     }
311 264
   }
312
-  .showMore{
313
-    width: 100%;
314
-    height: 156px;
315
-    background: linear-gradient(0deg, rgba(248, 248, 248, 0.58) 42%, rgba(248, 248, 248, 0) 100%);
316
-    font-size: 28px;
317
-     
318
-    font-weight: bold;
319
-    color: #202020;
320
-    text-align: center;
265
+  .circleTop{
266
+    width: 30px;
267
+    height: 16px;
268
+    border-radius: 15px 15px 0 0;
269
+    background-color: #F8F8F8;
321 270
     position: absolute;
322
-    bottom: -25px;
323
-    view{
324
-      padding-top: 77px;
325
-    }
326
-    .moreTip{
327
-      width: 38px;
328
-      height: 19px;
329
-    }
271
+    bottom: 0;
272
+    right: 16%;
273
+    
330 274
   }
331
-  .storezn{
332
-    font-size: 28px;
333
-     
334
-      color: #202020;
335
-    line-height: 54px;
336
-    margin-bottom: 40px;
275
+  .circleBottom{
276
+    width: 30px;
277
+    height: 16px;
278
+    border-radius:0 0 15px 15px;
279
+    background-color: #F8F8F8;
280
+    position: absolute;
281
+    top: 0;
282
+    right: 16%;
283
+    
337 284
   }
338
-  .storezn+image{
339
-    width: 100%;
285
+  .columnLine{
286
+    height: 50%;
287
+    border-right: 2px dashed #595959;
288
+    opacity: 0.12;
289
+    position: absolute;
290
+    right: 18%;
291
+    bottom:15%;
292
+  }
293
+}
294
+.showMore{
295
+  width: 100%;
296
+  background: linear-gradient(0deg, rgba(248, 248, 248, 0.58) 42%, rgba(248, 248, 248, 0) 100%);
297
+  font-size: 28px;
298
+  font-weight: bold;
299
+  color: #202020;
300
+  text-align: center;
301
+  position: absolute;
302
+  bottom: -40px;
303
+  padding-top: 77px;
304
+  padding-bottom: 20px;
305
+  .moreTip{
306
+    width: 38px;
307
+    height: 19px;
308
+    margin-top: 14px;
340 309
   }
310
+}
311
+.storezn{
312
+  font-size: 28px;    
313
+  color: #202020;
314
+  line-height: 54px;
315
+  margin-bottom: 44px;
316
+}
317
+.storezn+image{
318
+  width: 100%;
319
+  margin-bottom: 40px;
320
+}
321
+.waterfall{
322
+  column-count: 2;      //分两列
323
+  column-gap: 30px;    //列间距
324
+  background-color: #F8F8F8;
325
+  padding:30px 30px 0 30px;
341 326
   
342
-  .waterfall{
343
-    column-count: 2;      //分两列
344
-    column-gap: 30px;    //列间距
345
-    background-color: #F8F8F8;
346
-    
347
-    .contentCard{
348
-      background: #FFF;
349
-      box-shadow: 0px 8px 38px 0px rgba(0, 0, 0, 0.12);
350
-      border-radius: 24px;
351
-      overflow: hidden;
352
-      margin-bottom:50px;
353
-      break-inside: avoid;
354
-      position: relative;
327
+  .contentCard{
328
+    background: #FFF;
329
+    box-shadow: 0px 8px 38px 0px rgba(0, 0, 0, 0.12);
330
+    border-radius: 24px;
331
+    overflow: hidden;
332
+    margin-bottom:50px;
333
+    break-inside: avoid;
334
+    position: relative;
355 335
 
356
-      .cardTop{
357
-        height: auto;
336
+    .cardTop{
337
+      border-radius: 24px 24px 0px 0px;
338
+      .cCardimg{
339
+        width: 100%;
358 340
         border-radius: 24px 24px 0px 0px;
341
+      }
342
+      .lefttips{
343
+        width:99px;
344
+        height:37px;
345
+        position: absolute;
346
+        left: 0;
347
+      }
348
+      .loveharde{
349
+        width: 22px;
350
+        height: 20px;
351
+        position: absolute;
352
+        right: 20px;
353
+        top: 10px;
354
+      }
355
+    }
356
+    .bContent{
357
+      padding:20px;
358
+      .cCword{
359
+        font-size: 24px;
360
+        font-weight: bold;
361
+        color: #404040;
362
+      }
363
+      
364
+      .cCleft{
365
+        float: left;
359 366
         position: relative;
360
-        
361
-
362
-        .cCardimg{
363
-          width: 100%;
364
-          border-radius: 24px 24px 0px 0px;
365
-        }
366
-        .lefttips{
367
-          width:99px;
368
-          height:37px;
367
+        padding:40px 0 30px 0;
368
+        .cCicon{
369
+          width: 17px;
370
+          height: 21px;
369 371
           position: absolute;
370 372
           left: 0;
373
+          top: 48px;
371 374
         }
372
-        .loveharde{
373
-          width: 22px;
374
-          height: 20px;
375
-          position: absolute;
376
-          right: 20px;
377
-          top: 10px;
378
-        }
379
-      }
380
-      .bContent{
381
-        padding:20px;
382
-        overflow: hidden;
383
-        .cCword{
375
+        .distance{
376
+          padding-left: 24px;
384 377
           font-size: 24px;
385
-           
386
-          font-weight: bold;
387
-          color: #404040;
388
-          line-height: 46px;
378
+          color: #C0C8D3;
389 379
         }
390
-        
391
-        .cCleft{
392
-          float: left;
393
-          position: relative;
394
-          padding:40px 0 30px 0;
395
-          .cCicon{
396
-            width: 17px;
397
-            height: 21px;
398
-            position: absolute;
399
-            left: 0;
400
-            top: 48px;
401
-          }
402
-          .distance{
403
-            padding-left: 30px;
404
-            font-size: 24px;
405
-             
406
-                      color: #C0C8D3;
407
-          }
380
+      }
381
+      .cCright{
382
+        position: relative;
383
+        float: right;
384
+        padding:40px 0 30px 0;
385
+        .money{
386
+          font-size: 20px;
387
+          color: #FF3434;          
388
+          position: absolute;
389
+          right: 78px;
390
+          bottom: 32px;
408 391
         }
409
-        .cCright{
410
-          position: relative;
411
-          float: right;
412
-          padding:40px 0 30px 0;
413
-          .money{
414
-            font-size: 20px;
415
-             
416
-                      color: #FF3434;          
417
-            position: absolute;
418
-            right: 80px;
419
-            top: 45px;
420
-          }
421
-          .price{
422
-            height: 21px;
423
-            font-size: 24px;
424
-             
425
-                      color: #FF3434;
426
-          }
392
+        .price{
393
+          font-size: 24px;
394
+          color: #FF3434;
427 395
         }
428 396
       }
429 397
     }
430 398
   }
431
-  .botton{
432
-    font-size: 28px;
433
-     
434
-      color: #C0C8D3;
435
-    line-height: 34px;
436
-    text-align: center;
437
-    padding:40px 0 50px 0;
438
-    background-color: #F8F8F8;
439
-  }
399
+}
400
+.botton{
401
+  font-size: 28px;   
402
+  color: #C0C8D3;
403
+  line-height: 34px;
404
+  text-align: center;
405
+  padding:40px 0 68px 0;
406
+  background-color: #F8F8F8;
440 407
 }

+ 8
- 10
src/pages/details/mjDetails/sceneryDetails.jsx Visa fil

@@ -30,24 +30,22 @@ export default (props) => {
30 30
       <view className='index-navbar'>
31 31
         <CustomNav title='十公里' />
32 32
       </view>
33
-      <view style={{ height: '100%', overflow: 'auto', padding: '0 30rpx', background: '#F8F8F8' }}>
34
-        <scroll-view scroll-y="true" scroll-view='true' bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll" className='content'>
33
+      <view style={{overflow: 'auto', padding: '0 30rpx', background: '#F8F8F8' }}>
34
+        <scroll-view scroll-y="true" scroll-view='true' bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll">
35 35
           <view className='storeDetails'>
36 36
             <image src={mj} className='storeImage' >
37 37
               <view className='tpPage'>
38
-                <text>1</text>/<text>64</text>
38
+                <text>1</text><text>/</text><text>64</text>
39 39
               </view>
40 40
             </image>
41 41
             <view className='storeJs'>
42
-              <view style={{ overflow: 'hidden' }}>
43
-                <view className='introduce'>
44
-                  <text className='storeName'>玄武湖</text>
45
-                </view>
46
-                <view className='bz'>
47
-                  <image src={ax} style={{ width: '13rpx', height: '13rpx', marginRight: '11rpx', marginBottom: '-2rpx' }} />
42
+              <view className='introduce'>
43
+                <text className='storeName'>玄武湖</text>
44
+              </view>
45
+              <view className='bz'>
46
+                  <image src={ax} style={{ width: '15px', height: '15px', marginRight: '10px', marginBottom: '-2px' }} />
48 47
                   <text className='bzRight'>爆赞<text>9999+</text></text>
49 48
                 </view>
50
-              </view>
51 49
               <view className='wz'>凤游寺52号悦动新门西15栋111号</view>
52 50
               <view className='dpPosition'>
53 51
                 <image src={dw} className='dwTip' />

+ 276
- 316
src/pages/details/mjDetails/sceneryDetails.less Visa fil

@@ -6,52 +6,48 @@
6 6
     position: relative;
7 7
     border-radius: 22px;
8 8
     width: 100%;
9
-      .tpPage{
9
+    .tpPage{
10 10
       position: absolute;
11 11
       right: 20px;
12 12
       bottom: 20px;
13
-      width: 60px;
14 13
       background: #000000;
15 14
       border-radius: 16px;  
16
-      font-size: 24px;
17
-       
18
-          color: #FFFFFF;
15
+      font-size: 24px;       
16
+      color: #FFFFFF;
19 17
       padding:0 7px;
20
-      text-align: center;
21 18
       opacity: 0.4;  
19
+      line-height: 32px;
20
+      padding: 7px 8px 8px 7px;
22 21
       text{
23 22
         opacity: 0.64;
24 23
       }
25 24
     }
26 25
   }  
27 26
   .storeJs{
28
-    padding: 20px;
27
+    padding: 22px;
29 28
     .introduce{
30
-      float: left;
29
+      display: inline-block;
31 30
       .storeName{
32
-        font-size: 32px;
33
-         
31
+        font-size: 32px;         
34 32
         font-weight: bold;
35 33
         color: #020200;
36
-        padding-right: 60px;
37 34
       }
38 35
     }
39 36
     .bz{
40 37
       float: right;
41 38
       .bzRight{
42
-        font-size: 24px;
43
-         
44
-              color: #202020;
39
+        font-size: 24px;         
40
+        color: #202020;
45 41
         line-height: 34px;
46 42
         height: 23px;
47 43
       }
48 44
     }
49 45
     .wz{
50
-      font-size: 24px;
51
-       
46
+      font-size: 24px;      
47
+      line-height: 0;
48
+      padding: 30rpx 0 32rpx 0;
52 49
       font-weight: bold;
53 50
       color: #404040;
54
-      line-height: 46px;
55 51
     }
56 52
     .dpPosition{
57 53
       position: relative;
@@ -63,372 +59,336 @@
63 59
         left:0;
64 60
       }
65 61
       .distance{
66
-        padding-left: 30px;
67
-        font-size: 24px;
68
-         
69
-              color: #C0C8D3;
62
+        padding-left: 38px;
63
+        font-size: 24px;         
64
+        color: #C0C8D3;
70 65
       }
71 66
     }
72 67
   }
73 68
 }
74 69
 .jdjs{
75
-  height: 325px;
76
-  background: #FFFFFF;
70
+  background: #FFF;
77 71
   border-radius: 12px 12px 0px 0px;
78
-  padding: 30px 25px 40px 20px;
79
-  font-size: 24px;
80
-   
72
+  padding: 30px 20px 43px 20px;
73
+  font-size: 24px;   
81 74
   font-weight: bold;
82 75
   color: #202020;
83 76
   line-height: 54px;
84 77
   overflow: hidden;
85 78
   .line{
86
-    width: calc(100% - 40px);
87 79
     height: 1px;
88
-    background: #000000;
80
+    background: #000;
89 81
     opacity: 0.1;
90 82
     margin:57px 20px 42px 20px;
91 83
   }
92 84
   .sc{
93
-    font-size: 20px;
94
-     
85
+    font-size: 20px;     
95 86
     font-weight: bold;
96
-    color: #333333;
87
+    color: #333;
97 88
     float: right;
98 89
     line-height: 0;
99
-    margin-right: 20px;
90
+    margin-right: 4px;
100 91
     .scTip{
101 92
       width: 20px;
102 93
       height: 20px;
94
+      margin-right: 8px;
103 95
     }
104 96
   }
105 97
 }
106
-.content{
107
-  width: 100%;
108
-  height: calc(100vh - 120px);
109
-  .title{
110
-    margin: 60px 0 40px 0;
111
-    image{
112
-      width: 30px;
113
-      height: 30px;
114
-      position: relative;
115
-      top: 5px;
116
-    }
117
-    text{
118
-      font-size: 34px;
119
-       
98
+.title{
99
+  margin: 60px 0 40px 0;
100
+  image{
101
+    width: 30px;
102
+    height: 30px;
103
+  }
104
+  text{
105
+    font-size: 34px;      
106
+    font-weight: bold;
107
+    color: #202020;
108
+    margin-left: 10px;
109
+  }
110
+  .gltitle{
111
+    width: 32px;
112
+    height: 32px;
113
+    position: relative;
114
+    top: 5px;
115
+  }
116
+}
117
+.foodCard{
118
+  background: #FFFFFF;
119
+  box-shadow: 0px 8px 38px 0px rgba(0, 0, 0, 0.12);
120
+  border-radius: 12px;
121
+  position: relative;
122
+  margin-bottom: 30px;
123
+  overflow: hidden;
124
+  .fCleft{
125
+    float: left;
126
+    width: 82%;
127
+    .backMoney{
128
+      font-size: 24px;
120 129
       font-weight: bold;
121
-      color: #202020;
122
-      margin-left: 10px;
130
+      color: #FFF;
131
+      margin: 22px 40px 20px 0;        
132
+      padding: 12px 17px 9px 6px;
133
+      background:url('../../../assets/icons/housemantj/fximg.png') no-repeat;    
134
+      display: inline-block;
135
+      background-size: 100% 100%;
136
+    }
137
+    .appraise{
138
+      display: inline-block;
139
+      image{
140
+        width: 21px;
141
+        height: 21px;
142
+        margin-right: 10px;
143
+      }
144
+      text{
145
+        font-size: 24px;           
146
+        font-weight: bold;
147
+        color: #020200;
148
+      }
123 149
     }
124
-    .gltitle{
125
-      width: 32px;
126
-      height: 32px;
150
+    .contentImg{
151
+      margin: 0 20px 43px 20px;
127 152
       position: relative;
128
-      top: 5px;
153
+      display: inline-block;
154
+      .img1{
155
+        width: 144px;
156
+        height: 144px;
157
+        border-radius: 24px;
158
+      }
159
+      .mstip{
160
+          width:99px;
161
+          height:37px;
162
+          position: absolute;
163
+          left: 0;          
164
+      }
129 165
     }
130
-  }
131
-
132
-  .foodCard{
133
-    background: #FFFFFF;
134
-    box-shadow: 0px 8px 38px 0px rgba(0, 0, 0, 0.12);
135
-    border-radius: 12px;
136
-    position: relative;
137
-    margin-bottom: 30px;
138
-    overflow: hidden;
139
-    .fCleft{
140
-      float: left;
141
-      width: 82%;
142
-      height: 100%;
143
-      .backMoney{
144
-        font-size: 24px;
145
-        font-family: PingFang SC;
146
-        font-weight: bold;
147
-        color: #FFFFFF;
148
-        margin: 22px 40px 30px 0;        
149
-        display: block;
150
-        padding: 12px 17px 9px 6px;
151
-        background:url('../../../assets/icons/housemantj/fximg.png') no-repeat;    
152
-        display: inline-block;
153
-        background-size: 100% 100%;
166
+    .neirong{
167
+      display: inline-block;
168
+      width: 65%;
169
+      .textword{
170
+        font-size: 24px;           
171
+        color: #333;
172
+        margin: 0 21px 0 0;
173
+        height: 84px;
154 174
       }
155
-      .appraise{
156
-        display: inline-block;
157
-        image{
158
-          width: 24px;
159
-          height: 24px;
160
-          margin-right: 10px;
161
-        }
162
-        text{
163
-          font-size: 24px;
164
-           
165
-          font-weight: bold;
166
-          color: #020200;
175
+      .jiage{
176
+        line-height: 20px;
177
+        font-weight: bold;
178
+        color: #333;
179
+        .rmb{
180
+          font-size: 20px;             
181
+          margin: 0 8px 0 7px;
167 182
         }
168
-      }
169
-      .contentImg{
170
-        margin: 0 0 43px 20px;
171
-        position: relative;
172
-        float: left;
173
-        .img1{
174
-          width: 144px;
175
-          height: 144px;
176
-          border-radius: 24px;
183
+        .p1{
184
+          font-size: 24px;     
177 185
         }
178
-        .mstip{
179
-            width:99px;
180
-            height:37px;
181
-            position: absolute;
182
-            left: 0;          
186
+        .p2{
187
+          font-size: 18px;             
188
+          text-decoration: line-through;
189
+          color: #666;
183 190
         }
184 191
       }
185
-      .neirong{
186
-        float: right;
187
-        width: 65%;
188
-        .textword{
189
-          font-size: 24px;
190
-           
191
-                  color: #333333;
192
-          margin: 0 21px 0 0;
192
+      .address{
193
+        line-height: 0;
194
+        margin-top: 18px;
195
+        .dw{
196
+          width: 16px;
197
+          height: 20px;
198
+          position: relative;
199
+          top:3px;
200
+          margin-right: 10px;
193 201
         }
194
-        .jiage{
195
-          .rmb{
196
-            font-size: 20px;
197
-             
198
-            font-weight: bold;
199
-            color: #333333;
200
-          }
201
-          .p1{
202
-            font-size: 24px;
203
-             
204
-            font-weight: bold;
205
-            color: #333333;
206
-          }
207
-          .p2{
208
-            font-size: 18px;
209
-             
210
-                      text-decoration: line-through;
211
-            color: #666666;
212
-          }
202
+        .wz{
203
+          font-size: 20px;             
204
+          color: #333;
213 205
         }
214
-        .address{
215
-          line-height: 10px;
216
-          .dw{
217
-            width: 16px;
218
-            height: 20px;
219
-            position: relative;
220
-            top:3px;
221
-            margin-right: 10px;
222
-          }
223
-          .wz{
224
-            font-size: 20px;
225
-             
226
-                      color: #333333;
227
-          }
228
-          .star{
229
-            width: 21px;
230
-            height: 21px;
231
-            margin: 0 10px 0 30px;
232
-            position: relative;
233
-            top: 3px;
234
-          }
235
-          .collection{
236
-            font-size: 20px;
237
-             
238
-                      color: #333333;
239
-          }
206
+        .star{
207
+          width: 21px;
208
+          height: 21px;
209
+          margin: 0 10px 0 40px;
210
+          position: relative;
211
+          top: 3px;
212
+        }
213
+        .collection{
214
+          font-size: 20px;             
215
+          color: #333333;
240 216
         }
241 217
       }
242 218
     }
243
-    .fCright{
244
-      float: right;
245
-      width: 18%;
246
-      height: 100%;
247
-      image{
248
-        width: 35px;
249
-        height:32px;
250
-        margin-top: 135%;
251
-        margin-left:calc(50% - 15px)
252
-      }
253
-      view{
254
-        font-size: 24px;
255
-         
256
-        font-weight: bold;
257
-        color: #202020;
258
-        text-align: center;
259
-      }
260
-    }
261
-    .circleTop{
262
-      width: 30px;
263
-      height: 16px;
264
-      border-radius: 15px 15px 0 0;
265
-      background-color: #F8F8F8;
266
-      position: absolute;
267
-      bottom: 0;
268
-      right: 16%;
269
-      
270
-    }
271
-    .circleBottom{
272
-      width: 30px;
273
-      height: 16px;
274
-      border-radius:0 0 15px 15px;
275
-      background-color: #F8F8F8;
276
-      position: absolute;
277
-      top: 0;
278
-      right: 16%;
279
-      
219
+  }
220
+  .fCright{
221
+    float: right;
222
+    width: 18%;
223
+    line-height: 0;
224
+    image{
225
+      width: 35px;
226
+      height:32px;
227
+      margin-top: 135%;
228
+      margin-left:calc(50% - 15px)
280 229
     }
281
-    .columnLine{
282
-      height: 50%;
283
-      border-right: 5px dashed #595959;
284
-      opacity: 0.12;
285
-      position: absolute;
286
-      right: 18%;
287
-      bottom:15%;
230
+    view{
231
+      font-size: 24px;
232
+      line-height: 23px;
233
+      font-weight: bold;
234
+      color: #202020;
235
+      margin-top: 19px;
236
+      text-align: center;
288 237
     }
289 238
   }
290
-  .showMore{
291
-    width: 100%;
292
-    height: 156px;
293
-    background: linear-gradient(0deg, rgba(248, 248, 248, 0.58) 42%, rgba(248, 248, 248, 0) 100%);
294
-    font-size: 28px;
295
-     
296
-    font-weight: bold;
297
-    color: #202020;
298
-    text-align: center;
239
+  .circleTop{
240
+    width: 30px;
241
+    height: 16px;
242
+    border-radius: 15px 15px 0 0;
243
+    background-color: #F8F8F8;
299 244
     position: absolute;
300
-    bottom: -25px;
301
-    view{
302
-      padding-top: 77px;
303
-    }
304
-    .moreTip{
305
-      width: 38px;
306
-      height: 19px;
307
-    }
245
+    bottom: 0;
246
+    right: 16%;
247
+    
308 248
   }
309
-  .storezn{
310
-    font-size: 28px;
311
-     
312
-      color: #202020;
313
-    line-height: 54px;
314
-    margin-bottom: 40px;
249
+  .circleBottom{
250
+    width: 30px;
251
+    height: 16px;
252
+    border-radius:0 0 15px 15px;
253
+    background-color: #F8F8F8;
254
+    position: absolute;
255
+    top: 0;
256
+    right: 16%;
257
+    
315 258
   }
316
-  .storezn+image{
317
-    width: 100%;
259
+  .columnLine{
260
+    height: 50%;
261
+    border-right: 2px dashed #595959;
262
+    opacity: 0.12;
263
+    position: absolute;
264
+    right: 18%;
265
+    bottom:15%;
318 266
   }
319
-  
320
-  .waterfall{
321
-    column-count: 2;      //分两列
322
-    column-gap: 30px;    //列间距
323
-    background-color: #F8F8F8;
267
+}
268
+.showMore{
269
+  width: 100%;
270
+  background: linear-gradient(0deg, rgba(248, 248, 248, 0.58) 42%, rgba(248, 248, 248, 0) 100%);
271
+  font-size: 28px;
272
+  font-weight: bold;
273
+  color: #202020;
274
+  text-align: center;
275
+  position: absolute;
276
+  bottom: -40px;
277
+  padding-top: 77px;
278
+  padding-bottom: 20px;
279
+  .moreTip{
280
+    width: 38px;
281
+    height: 19px;
282
+    margin-top: 14px;
283
+  }
284
+}
285
+.storezn{
286
+  font-size: 28px;
324 287
     
325
-    .contentCard{
326
-      background: #FFF;
327
-      box-shadow: 0px 8px 38px 0px rgba(0, 0, 0, 0.12);
328
-      border-radius: 24px;
329
-      overflow: hidden;
330
-      margin-bottom:50px;
331
-      break-inside: avoid;
332
-      position: relative;
288
+    color: #202020;
289
+  line-height: 54px;
290
+  margin-bottom: 40px;
291
+}
292
+.storezn+image{
293
+  width: 100%;
294
+}  
295
+.waterfall{
296
+  column-count: 2;      //分两列
297
+  column-gap: 30px;    //列间距
298
+  background-color: #F8F8F8;
299
+  
300
+  .contentCard{
301
+    background: #FFF;
302
+    box-shadow: 0px 8px 38px 0px rgba(0, 0, 0, 0.12);
303
+    border-radius: 24px;
304
+    overflow: hidden;
305
+    margin-bottom:50px;
306
+    break-inside: avoid;
307
+    position: relative;
333 308
 
334
-      .cardTop{
335
-        height: auto;
309
+    .cardTop{
310
+      border-radius: 24px 24px 0px 0px;
311
+      .cCardimg{
312
+        width: 100%;
336 313
         border-radius: 24px 24px 0px 0px;
314
+      }
315
+      .lefttips{
316
+        width:99px;
317
+        height:37px;
318
+        position: absolute;
319
+        left: 0;
320
+      }
321
+      .loveharde{
322
+        width: 22px;
323
+        height: 20px;
324
+        position: absolute;
325
+        right: 20px;
326
+        top: 10px;
327
+      }
328
+    }
329
+    .bContent{
330
+      padding:20px;
331
+      .cCword{
332
+        font-size: 24px;
333
+        font-weight: bold;
334
+        color: #404040;
335
+      }
336
+      
337
+      .cCleft{
338
+        float: left;
337 339
         position: relative;
338
-        
339
-
340
-        .cCardimg{
341
-          width: 100%;
342
-          border-radius: 24px 24px 0px 0px;
343
-        }
344
-        .lefttips{
345
-          width:99px;
346
-          height:37px;
340
+        padding:40px 0 30px 0;
341
+        .cCicon{
342
+          width: 17px;
343
+          height: 21px;
347 344
           position: absolute;
348 345
           left: 0;
346
+          top: 48px;
349 347
         }
350
-        .loveharde{
351
-          width: 22px;
352
-          height: 20px;
353
-          position: absolute;
354
-          right: 20px;
355
-          top: 10px;
356
-        }
357
-      }
358
-      .bContent{
359
-        padding:20px;
360
-        overflow: hidden;
361
-        .cCword{
348
+        .distance{
349
+          padding-left: 24px;
362 350
           font-size: 24px;
363
-           
364
-          font-weight: bold;
365
-          color: #404040;
366
-          line-height: 46px;
351
+          color: #C0C8D3;
367 352
         }
368
-        
369
-        .cCleft{
370
-          float: left;
371
-          position: relative;
372
-          padding:40px 0 30px 0;
373
-          .cCicon{
374
-            width: 17px;
375
-            height: 21px;
376
-            position: absolute;
377
-            left: 0;
378
-            top: 48px;
379
-          }
380
-          .distance{
381
-            padding-left: 30px;
382
-            font-size: 24px;
383
-             
384
-                      color: #C0C8D3;
385
-          }
353
+      }
354
+      .cCright{
355
+        position: relative;
356
+        float: right;
357
+        padding:40px 0 30px 0;
358
+        .money{
359
+          font-size: 20px;
360
+          color: #FF3434;          
361
+          position: absolute;
362
+          right: 78px;
363
+          bottom: 32px;
386 364
         }
387
-        .cCright{
388
-          position: relative;
389
-          float: right;
390
-          padding:40px 0 30px 0;
391
-          .money{
392
-            font-size: 20px;
393
-             
394
-                      color: #FF3434;          
395
-            position: absolute;
396
-            right: 80px;
397
-            top: 45px;
398
-          }
399
-          .price{
400
-            height: 21px;
401
-            font-size: 24px;
402
-             
403
-                      color: #FF3434;
404
-          }
365
+        .price{
366
+          font-size: 24px;
367
+          color: #FF3434;
405 368
         }
406 369
       }
407 370
     }
408 371
   }
409
-  .bottom{
410
-    font-size: 28px;
411
-     
412
-      color: #C0C8D3;
413
-    line-height: 34px;
414
-    text-align: center;
415
-    padding:40px 0 60px 0;
416
-    background-color: #F8F8F8;
417
-  }
418 372
 }
373
+.bottom{
374
+  font-size: 28px;    
375
+  color: #C0C8D3;
376
+  line-height: 34px;
377
+  text-align: center;
378
+  padding:40px 0 60px 0;
379
+  background-color: #F8F8F8;
380
+}
381
+
419 382
 .bottomTab{
420
-  width: 100%;
421
-  height: 96px;
422
-  background: #FFFFFF;
383
+  background: #FFF;
423 384
   border-radius: 12px;
385
+  column-count: 3;
386
+  text-align: center;  
424 387
   .tab{
425 388
     line-height: 96px;
426
-    margin: 0 60px;
427
-    font-size: 28px;
428
-     
389
+    font-size: 28px;     
429 390
     font-weight: bold;
430 391
     color: #202020;
431
-    display: inline-block;
432 392
     image{
433 393
       width: 31px;
434 394
       height: 31px;

+ 1
- 6
src/pages/index/tabs/less/Recommend.less Visa fil

@@ -28,7 +28,6 @@
28 28
       letter-spacing: 0.2em;
29 29
     }
30 30
 }
31
-
32 31
 .tip{
33 32
   padding:23px 0 22px 31px;
34 33
   height: 70px;
@@ -105,9 +104,6 @@
105 104
     }
106 105
   }
107 106
 }
108
-
109
-
110
-
111 107
 .content{
112 108
   width: 100%;
113 109
   height: calc(100vh - 120px);
@@ -197,5 +193,4 @@
197 193
     padding:40px 0 50px 0;
198 194
     background-color: #F8F8F8;
199 195
   } 
200
-}
201
-
196
+}

+ 11
- 16
src/pages/login/login.less Visa fil

@@ -6,39 +6,34 @@
6 6
 }
7 7
 .v1{
8 8
   font-size: 28px;
9
-   
10
-  font-weight: 400;
11
-  color: #999999;
9
+   line-height: 0;
10
+  color: #999;
12 11
   text-align: center;
13 12
 }
14 13
 .login{
15 14
   width: calc(100% - 60px);
16
-  height: 92px;
17 15
   background: #274190;
18 16
   border-radius: 12px;
19
-  font-size: 30px;
20
-   
17
+  font-size: 30px;   
21 18
   font-weight: bold;
22
-  color: #FFFFFF;
19
+  color: #FFF;
23 20
   text-align: center;
24 21
   line-height: 92px;
25 22
   margin:80px auto;
26 23
 }
27 24
 .buttom{
28
-  height: 25px;
29
-  font-size: 24px;
30
-   
31
-  font-weight: 400;
32
-  color: #666666;  
33
-  position: relative;
34
-  top: 350px;
25
+  font-size: 24px;   
26
+  color: #666;  
27
+  position: absolute;
35 28
   text-align: center;
36
-  bottom: 0;
29
+  bottom: 80px;
30
+  width: 100%;
37 31
   radio{
38 32
     transform:scale(0.5);
39 33
     margin-right: -9px;
40 34
     position: relative;
41
-    bottom: 1px;
35
+    bottom: 4px;
36
+    right: -8px;
42 37
   }
43 38
   text{
44 39
     color: #274190;

+ 30
- 35
src/pages/search/search.less Visa fil

@@ -1,50 +1,45 @@
1 1
 .search{
2
-    padding: 10px 30px 0 30px;
3
-    position: relative;
4
-    .searchInput{    
5
-        width: 690px;
6
-        height: 68px;
7
-        background: #F8F8F8;
8
-        border-radius: 34px;
9
-        padding-left: 106px;
10
-        box-sizing: border-box;
11
-        font-size: 24px;
12
-    }
13
-    .searchicon{
14
-      width: 25px;
15
-      height: 25px;
16
-      position: absolute;
17
-      bottom: 22px;
18
-      left: 54px;
19
-    }
20
-    .lineSearch{      
21
-      position: absolute;
22
-      bottom: 19px;
23
-      left: 100px;
24
-      width: 1px;
25
-      height: 28px;
26
-      background: #000000;
27
-      opacity: 0.2;
28
-    }    
2
+  padding: 10px 30px 0 30px;
3
+  position: relative;
4
+  .searchInput{    
5
+      height: 68px;
6
+      background: #F8F8F8;
7
+      border-radius: 34px;
8
+      padding-left: 86px;
9
+      box-sizing: border-box;
10
+      font-size: 24px;
11
+  }
12
+  .searchicon{
13
+    width: 25px;
14
+    height: 25px;
15
+    position: absolute;
16
+    bottom: 21px;
17
+    left: 50px;
18
+  }
19
+  .lineSearch{      
20
+    position: absolute;
21
+    bottom: 19px;
22
+    left: 95px;
23
+    width: 1px;
24
+    height: 28px;
25
+    background: #000;
26
+    opacity: 0.2;
27
+  }    
29 28
 }
30 29
 .content{
31 30
   padding: 60px 30px;
32 31
   .hotSearch{
33
-    font-size: 34px;
34
-     
32
+    font-size: 34px;     
35 33
     font-weight: bold;
36 34
     color: #202020;
37
-    display: block;
38
-    margin: 0 0 60px 0;
35
+    margin-bottom:58.4px;
39 36
   }
40 37
   .hotSearchtip view{
41 38
     border-radius: 30px;
42
-    font-size: 24px;
43
-     
39
+    font-size: 24px;     
44 40
     font-weight: bold;
45
-    display: block;
46 41
     margin:0 40px 40px 0;
47
-    padding:19px 25px;
42
+    padding:18px 23px;
48 43
     float: left;
49 44
     color: #666666;
50 45
     border: 1px solid #999999;

+ 9
- 13
src/pages/searchResult/searchResult.less Visa fil

@@ -1,12 +1,11 @@
1
-  .search{
1
+.search{
2 2
     padding: 10px 30px 0 30px;
3 3
     position: relative;
4 4
     .searchInput{    
5
-        width: 690px;
6 5
         height: 68px;
7 6
         background: #F8F8F8;
8 7
         border-radius: 34px;
9
-        padding-left: 106px;
8
+        padding-left: 86px;
10 9
         box-sizing: border-box;
11 10
         font-size: 24px;
12 11
     }
@@ -14,31 +13,29 @@
14 13
       width: 25px;
15 14
       height: 25px;
16 15
       position: absolute;
17
-      bottom: 22px;
18
-      left: 54px;
16
+      bottom: 21px;
17
+      left: 50px;
19 18
     }
20 19
     .lineSearch{      
21 20
       position: absolute;
22 21
       bottom: 19px;
23
-      left: 100px;
22
+      left: 95px;
24 23
       width: 1px;
25 24
       height: 28px;
26
-      background: #000000;
25
+      background: #000;
27 26
       opacity: 0.2;
28 27
     }    
29 28
 }
30 29
 .nav{
31
-  height: 91px;
32 30
   margin-left: 36px;
33 31
   .list{
34 32
     float: left;
35 33
     .bdattractions{
36 34
       float: left;
37
-      padding:28px 20px 27px 49px ;
35
+      padding:28px 49px 27px 20px ;
38 36
       box-sizing: border-box;  
39 37
       .acname{
40
-        font-size: 28px;
41
-         
38
+        font-size: 28px;         
42 39
         font-weight: bold;
43 40
         color: #C0C8D3;      
44 41
       }
@@ -46,8 +43,7 @@
46 43
         width: 30px;
47 44
         height: 6px;
48 45
         position: relative;
49
-        bottom:-27px;
50
-        left: 0;
46
+        top:27px;
51 47
         margin: 0 auto;
52 48
       }
53 49
     }