Commit 3152bb36b14917bfd20e841a5b0cdfaed4b72094
1 parent
0f68c64f
首页界面调整
Showing
5 changed files
with
125 additions
and
107 deletions
components/diy_goodsGroup/diy_goodsGroup.wxss
@@ -262,6 +262,9 @@ | @@ -262,6 +262,9 @@ | ||
262 | float: left; | 262 | float: left; |
263 | background: #fff; | 263 | background: #fff; |
264 | margin-left: 1%; | 264 | margin-left: 1%; |
265 | + border:1rpx solid rgb(214, 214, 214); | ||
266 | + border-radius: 25rpx; | ||
267 | + margin-top: 10rpx; | ||
265 | } | 268 | } |
266 | 269 | ||
267 | .zs_goods_2l { | 270 | .zs_goods_2l { |
components/diy_pingd_buy/diy_pingd_buy.wxml
1 | <!--pages/wp/wp.wxml--> | 1 | <!--pages/wp/wp.wxml--> |
2 | <block wx:if="goods_array.length>0"> | 2 | <block wx:if="goods_array.length>0"> |
3 | <!--拼单--> | 3 | <!--拼单--> |
4 | - <view class='top_p'> | 4 | + <view class='top_p' bindtap="go_to_pindlist"> |
5 | <view class="top"> | 5 | <view class="top"> |
6 | <view class='t_left_p'></view> | 6 | <view class='t_left_p'></view> |
7 | <view class='t_ms_p'>拼单</view> | 7 | <view class='t_ms_p'>拼单</view> |
8 | </view> | 8 | </view> |
9 | - <view class='right_p' bindtap="go_to_pindlist"> | 9 | + <view class='right_p'> |
10 | <image src="{{iurl}}/miniapp/images/icon-arrowdown.png" lazy-load="true"></image> | 10 | <image src="{{iurl}}/miniapp/images/icon-arrowdown.png" lazy-load="true"></image> |
11 | </view> | 11 | </view> |
12 | </view> | 12 | </view> |
components/diy_pingd_buy/diy_pingd_buy.wxss
@@ -2,6 +2,7 @@ | @@ -2,6 +2,7 @@ | ||
2 | .top{ | 2 | .top{ |
3 | display: flex; | 3 | display: flex; |
4 | align-items: center; | 4 | align-items: center; |
5 | + font-size: 32rpx; | ||
5 | } | 6 | } |
6 | .top_p { | 7 | .top_p { |
7 | padding:0rpx 20rpx; | 8 | padding:0rpx 20rpx; |
@@ -227,7 +228,7 @@ swiper { | @@ -227,7 +228,7 @@ swiper { | ||
227 | } | 228 | } |
228 | 229 | ||
229 | .o1_right_p .sp_wzi_p { | 230 | .o1_right_p .sp_wzi_p { |
230 | - font-size: 36rpx; | 231 | + font-size: 30rpx; |
231 | margin-bottom: 6rpx; | 232 | margin-bottom: 6rpx; |
232 | width: 100%; | 233 | width: 100%; |
233 | text-align: left; | 234 | text-align: left; |
@@ -240,7 +241,7 @@ swiper { | @@ -240,7 +241,7 @@ swiper { | ||
240 | 241 | ||
241 | .o1_right_p .o1_sj_p { | 242 | .o1_right_p .o1_sj_p { |
242 | height: 60rpx; | 243 | height: 60rpx; |
243 | - font-size: 28rpx; | 244 | + font-size: 26rpx; |
244 | line-height: 40rpx; | 245 | line-height: 40rpx; |
245 | } | 246 | } |
246 | 247 | ||
@@ -254,7 +255,7 @@ swiper { | @@ -254,7 +255,7 @@ swiper { | ||
254 | 255 | ||
255 | .o1_right_p .sp_jg_p { | 256 | .o1_right_p .sp_jg_p { |
256 | color: #c4182e; | 257 | color: #c4182e; |
257 | - font-size: 36rpx; | 258 | + font-size: 30rpx; |
258 | overflow: hidden; | 259 | overflow: hidden; |
259 | display: inline-block; | 260 | display: inline-block; |
260 | margin-right: 10rpx; | 261 | margin-right: 10rpx; |
@@ -277,12 +278,12 @@ swiper { | @@ -277,12 +278,12 @@ swiper { | ||
277 | 278 | ||
278 | .o1_right_p .wo_p { | 279 | .o1_right_p .wo_p { |
279 | background-color: #c4182e; | 280 | background-color: #c4182e; |
280 | - width: 160rpx; | ||
281 | - height: 60rpx; | ||
282 | - line-height: 60rpx; | 281 | + width: 150rpx; |
282 | + height: 55rpx; | ||
283 | + line-height: 55rpx; | ||
283 | color: white; | 284 | color: white; |
284 | text-align: center; | 285 | text-align: center; |
285 | - font-size: 32rpx; | 286 | + font-size: 30rpx; |
286 | border-radius: 14rpx; | 287 | border-radius: 14rpx; |
287 | position: absolute; | 288 | position: absolute; |
288 | right: 0; | 289 | right: 0; |
@@ -341,23 +342,24 @@ swiper { | @@ -341,23 +342,24 @@ swiper { | ||
341 | } | 342 | } |
342 | 343 | ||
343 | .o1_sj_p .time_img { | 344 | .o1_sj_p .time_img { |
344 | - width: 40rpx; | ||
345 | - height: 40rpx; | 345 | + width: 35rpx; |
346 | + height: 35rpx; | ||
346 | vertical-align: top; | 347 | vertical-align: top; |
347 | margin-right: 10rpx; | 348 | margin-right: 10rpx; |
348 | } | 349 | } |
349 | 350 | ||
350 | .o1_right_p .co-red2 { | 351 | .o1_right_p .co-red2 { |
351 | - font-size: 30rpx; | 352 | + font-size: 26rpx; |
352 | color: #999; | 353 | color: #999; |
353 | } | 354 | } |
354 | 355 | ||
355 | .o1_right_p .co-red2 .yituan_num { | 356 | .o1_right_p .co-red2 .yituan_num { |
356 | - font-size: 30rpx; | 357 | + font-size: 26rpx; |
357 | margin-right: 10rpx; | 358 | margin-right: 10rpx; |
358 | color: #333; | 359 | color: #333; |
359 | } | 360 | } |
360 | .money{ | 361 | .money{ |
361 | display: flex; | 362 | display: flex; |
362 | align-items: center; | 363 | align-items: center; |
364 | + margin:5rpx 0rpx; | ||
363 | } | 365 | } |
364 | \ No newline at end of file | 366 | \ No newline at end of file |
components/diy_seckill/diy_seckill.wxml
1 | <block wx:if="goods_array.length>0"> | 1 | <block wx:if="goods_array.length>0"> |
2 | <!--秒杀--> | 2 | <!--秒杀--> |
3 | - <view class='top'> | 3 | + <view class='top' bindtap="go_to_skill"> |
4 | <view class="flex"> | 4 | <view class="flex"> |
5 | <view class='t_left'></view> | 5 | <view class='t_left'></view> |
6 | <view class='t_ms'>秒杀</view> | 6 | <view class='t_ms'>秒杀</view> |
7 | - </view> | ||
8 | - <view class='right_k' bindtap="go_to_skill"> | ||
9 | - <image src="{{imghost}}/miniapp/images/icon-arrowdown.png" lazy-load="true"></image> | ||
10 | - </view> | ||
11 | - </view> | ||
12 | - | ||
13 | - <!--商品展示--> | ||
14 | - <swiper class="s_prom" indicator-active-color='red' indicator-dots="false" wx:if="{{object.style==1}}"> | ||
15 | - <view class='sp' wx:if="{{object.style==1}}"> | ||
16 | - <swiper-item class="s_it" wx:for="{{goods_array}}"> | ||
17 | - <block wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind"> | ||
18 | - <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}" class="s1_gk_a1"> | ||
19 | - <view class='one'> | ||
20 | - <view class='sp_top'> | ||
21 | - <view class='po'></view> | ||
22 | - <block wx:if="{{aitem.start_time>newTime}}"> | ||
23 | - <span class='s_top_kill' style="background-color: #ffe718;color: #3c3b31;font-weight: bold">即将开始</span> | ||
24 | - </block> | ||
25 | - <block wx:if="{{aitem.start_time<newTime && aitem.goods_num>aitem.buy_num}}"> | ||
26 | - <span class='s_top_kill'>火热进行</span> | ||
27 | - </block> | ||
28 | - <block wx:if="{{aitem.goods_num<=aitem.buy_num}}"> | ||
29 | - <span class='s_top_kill gray'>已抢光</span> | ||
30 | - </block> | ||
31 | - | ||
32 | - <view class='clear'></view> | ||
33 | - | ||
34 | - <view class='s_img'> | ||
35 | - <image src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> | ||
36 | - </view> | ||
37 | - | ||
38 | - <view class='s_foot_kill'> | ||
39 | - <text>{{aitem.djs.day}}天</text> | ||
40 | - <text>{{aitem.djs.hou}}时</text> | ||
41 | - <text>{{aitem.djs.min}}分</text> | ||
42 | - <text>{{aitem.djs.sec}}秒</text> | ||
43 | - </view> | ||
44 | - <view class='clear'></view> | ||
45 | - | 7 | + </view> |
8 | + <view class='right_k'> | ||
9 | + <image src="{{imghost}}/miniapp/images/icon-arrowdown.png" lazy-load="true"></image> | ||
10 | + </view> | ||
11 | + </view> | ||
12 | + | ||
13 | + <!--商品展示--> | ||
14 | + <swiper class="s_prom" indicator-active-color='red' indicator-dots="false" wx:if="{{object.style==1}}"> | ||
15 | + <view class='sp' wx:if="{{object.style==1}}"> | ||
16 | + <swiper-item class="s_it" wx:for="{{goods_array}}"> | ||
17 | + <block wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind"> | ||
18 | + <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}" class="s1_gk_a1"> | ||
19 | + <view class='one'> | ||
20 | + <view class='sp_top'> | ||
21 | + <view class='po'></view> | ||
22 | + <block wx:if="{{aitem.start_time>newTime}}"> | ||
23 | + <view class="rob"> | ||
24 | + <span class='s_top_kill' style="background-color: #ffe718;color: #3c3b31;font-weight: bold">即将开始</span> | ||
46 | </view> | 25 | </view> |
47 | - | ||
48 | - <view class='sp_wz'> | ||
49 | - <view class='sp_wzi'>{{aitem.goods_name}}</view> | ||
50 | - <view class='sp_jg'>¥{{aitem.price}}</view> | ||
51 | - <view class='sp_jgx'>¥{{aitem.market_price}}</view> | 26 | + </block> |
27 | + <block wx:if="{{aitem.start_time<newTime && aitem.goods_num>aitem.buy_num}}"> | ||
28 | + <view class="rob"> | ||
29 | + <span class='s_top_kill'>火热进行</span> | ||
30 | + </view> | ||
31 | + </block> | ||
32 | + <block wx:if="{{aitem.goods_num<=aitem.buy_num}}"> | ||
33 | + <view class="rob"> | ||
34 | + <span class='s_top_kill gray'>已抢光</span> | ||
52 | </view> | 35 | </view> |
36 | + </block> | ||
53 | 37 | ||
54 | - </view> | ||
55 | - </navigator> | ||
56 | - </block> | ||
57 | - </swiper-item> | ||
58 | - </view> | ||
59 | - </swiper> | ||
60 | - | ||
61 | - <view class="sp2" wx:if="{{object.style==2}}"> | ||
62 | - <block wx:for="{{goods_array}}"> | ||
63 | - <block wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind"> | ||
64 | - <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}" class="s1_gk_a1"> | ||
65 | - <view class='one1'> | ||
66 | - | ||
67 | - <view class="o1_img"> | 38 | + <view class='clear'></view> |
39 | + | ||
40 | + <view class='s_img'> | ||
68 | <image src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> | 41 | <image src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> |
69 | </view> | 42 | </view> |
70 | 43 | ||
71 | - <view class="o1_right"> | ||
72 | - <view class="sp_wzi">{{aitem.goods_name}}</view> | ||
73 | - <view class="o1_sj_kill"> | ||
74 | - <text>{{aitem.djs.day}}</text> 天 | ||
75 | - <text>{{aitem.djs.hou}}</text> : | ||
76 | - <text>{{aitem.djs.min}}</text> : | ||
77 | - <text>{{aitem.djs.sec}}</text> | 44 | + <view class='s_foot_kill'> |
45 | + <text>{{aitem.djs.day}}天</text> | ||
46 | + <text>{{aitem.djs.hou}}时</text> | ||
47 | + <text>{{aitem.djs.min}}分</text> | ||
48 | + <text>{{aitem.djs.sec}}秒</text> | ||
49 | + </view> | ||
50 | + <view class='clear'></view> | ||
78 | 51 | ||
79 | - </view> | ||
80 | - <view class="money"> | ||
81 | - <view class='sp_jg'>¥{{aitem.price}}</view> | ||
82 | - <view class='sp_jgx'>¥{{aitem.market_price}}</view> | ||
83 | - </view> | ||
84 | - <block wx:if="{{aitem.start_time>newTime}}"> | ||
85 | - <view class="wo" style="background-color: #adadad">正在预热</view> | ||
86 | - </block> | ||
87 | - <block wx:if="{{aitem.start_time<newTime && aitem.goods_num>aitem.buy_num}}"> | ||
88 | - <view class="rob"> | ||
89 | - <view class="wo">我要抢</view> | ||
90 | - </view> | ||
91 | - </block> | 52 | + </view> |
53 | + | ||
54 | + <view class='sp_wz'> | ||
55 | + <view class='sp_wzi'>{{aitem.goods_name}}</view> | ||
56 | + <view class='sp_jg'>¥{{aitem.price}}</view> | ||
57 | + <view class='sp_jgx'>¥{{aitem.market_price}}</view> | ||
58 | + </view> | ||
92 | 59 | ||
93 | - <block wx:if="{{aitem.goods_num<=aitem.buy_num}}"> | ||
94 | - <view class="wo" style="background-color: #adadad">已抢光</view> | ||
95 | - </block> | 60 | + </view> |
61 | + </navigator> | ||
62 | + </block> | ||
63 | + </swiper-item> | ||
64 | + </view> | ||
65 | + </swiper> | ||
66 | + | ||
67 | + <view class="sp2" wx:if="{{object.style==2}}"> | ||
68 | + <block wx:for="{{goods_array}}"> | ||
69 | + <block wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind"> | ||
70 | + <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}" class="s1_gk_a1"> | ||
71 | + <view class='one1'> | ||
72 | + | ||
73 | + <view class="o1_img"> | ||
74 | + <image src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> | ||
75 | + </view> | ||
76 | + | ||
77 | + <view class="o1_right"> | ||
78 | + <view class="sp_wzi">{{aitem.goods_name}}</view> | ||
79 | + <view class="o1_sj_kill"> | ||
80 | + <text>{{aitem.djs.day}}</text> 天 | ||
81 | + <text>{{aitem.djs.hou}}</text> : | ||
82 | + <text>{{aitem.djs.min}}</text> : | ||
83 | + <text>{{aitem.djs.sec}}</text> | ||
96 | 84 | ||
85 | + </view> | ||
86 | + <view class="money"> | ||
87 | + <view class='sp_jg'>¥{{aitem.price}}</view> | ||
88 | + <view class='sp_jgx'>¥{{aitem.market_price}}</view> | ||
89 | + </view> | ||
90 | + <block wx:if="{{aitem.start_time>newTime}}"> | ||
91 | + <view class="rob"> | ||
92 | + <view class="wo" style="background-color: #adadad">正在预热</view> | ||
93 | + </view> | ||
94 | + </block> | ||
95 | + <block wx:if="{{aitem.start_time<newTime && aitem.goods_num>aitem.buy_num}}"> | ||
96 | + <view class="rob"> | ||
97 | + <view class="wo">我要抢</view> | ||
98 | + </view> | ||
99 | + </block> | ||
97 | 100 | ||
101 | + <block wx:if="{{aitem.goods_num<=aitem.buy_num}}"> | ||
102 | + <view class="rob"> | ||
103 | + <view class="wo" style="background-color: #adadad">已抢光</view> | ||
98 | </view> | 104 | </view> |
99 | - </view> | ||
100 | - </navigator> | ||
101 | - </block> | ||
102 | - </block> | 105 | + </block> |
106 | + | ||
107 | + | ||
108 | + </view> | ||
109 | + </view> | ||
110 | + </navigator> | ||
111 | + </block> | ||
112 | + </block> | ||
103 | 113 | ||
104 | - </view> | ||
105 | - <view class='clear'></view> | 114 | + </view> |
115 | + <view class='clear'></view> | ||
106 | 116 | ||
107 | </block> | 117 | </block> |
108 | \ No newline at end of file | 118 | \ No newline at end of file |
components/diy_seckill/diy_seckill.wxss
@@ -11,6 +11,7 @@ | @@ -11,6 +11,7 @@ | ||
11 | padding:0rpx 20rpx; | 11 | padding:0rpx 20rpx; |
12 | display: flex; | 12 | display: flex; |
13 | justify-content: space-between; | 13 | justify-content: space-between; |
14 | + font-size: 32rpx; | ||
14 | } | 15 | } |
15 | 16 | ||
16 | .s_it { | 17 | .s_it { |
@@ -220,7 +221,7 @@ swiper { | @@ -220,7 +221,7 @@ swiper { | ||
220 | } | 221 | } |
221 | 222 | ||
222 | .o1_right .sp_wzi { | 223 | .o1_right .sp_wzi { |
223 | - font-size: 36rpx; | 224 | + font-size: 30rpx; |
224 | margin-bottom: 6rpx; | 225 | margin-bottom: 6rpx; |
225 | text-align: left; | 226 | text-align: left; |
226 | padding: 4rpx 0; | 227 | padding: 4rpx 0; |
@@ -233,6 +234,7 @@ swiper { | @@ -233,6 +234,7 @@ swiper { | ||
233 | .o1_right .o1_sj_kill { | 234 | .o1_right .o1_sj_kill { |
234 | height: 60rpx; | 235 | height: 60rpx; |
235 | margin-bottom: 10rpx; | 236 | margin-bottom: 10rpx; |
237 | + font-size: 28rpx; | ||
236 | } | 238 | } |
237 | 239 | ||
238 | .o1_right .o1_sj_kill text { | 240 | .o1_right .o1_sj_kill text { |
@@ -245,7 +247,7 @@ swiper { | @@ -245,7 +247,7 @@ swiper { | ||
245 | 247 | ||
246 | .o1_right .sp_jg { | 248 | .o1_right .sp_jg { |
247 | color: #c4182e; | 249 | color: #c4182e; |
248 | - font-size: 36rpx; | 250 | + font-size: 30rpx; |
249 | overflow: hidden; | 251 | overflow: hidden; |
250 | display: inline-block; | 252 | display: inline-block; |
251 | margin-right: 10rpx; | 253 | margin-right: 10rpx; |
@@ -268,17 +270,18 @@ swiper { | @@ -268,17 +270,18 @@ swiper { | ||
268 | } | 270 | } |
269 | .o1_right .wo { | 271 | .o1_right .wo { |
270 | background-color: #c4182e; | 272 | background-color: #c4182e; |
271 | - width: 160rpx; | ||
272 | - height: 60rpx; | ||
273 | - line-height: 60rpx; | 273 | + width: 150rpx; |
274 | + height: 50rpx; | ||
275 | + line-height: 50rpx; | ||
274 | color: white; | 276 | color: white; |
275 | text-align: center; | 277 | text-align: center; |
276 | - font-size: 32rpx; | 278 | + font-size: 30rpx; |
277 | border-radius: 14rpx; | 279 | border-radius: 14rpx; |
278 | } | 280 | } |
279 | .rob{ | 281 | .rob{ |
280 | display: flex; | 282 | display: flex; |
281 | justify-content: flex-end; | 283 | justify-content: flex-end; |
284 | + font-size: 30rpx; | ||
282 | } | 285 | } |
283 | .money{ | 286 | .money{ |
284 | display: flex; | 287 | display: flex; |