diff --git a/pages/activity/pind_list/pind_list.wxml b/pages/activity/pind_list/pind_list.wxml index e2da691..e1e4dec 100644 --- a/pages/activity/pind_list/pind_list.wxml +++ b/pages/activity/pind_list/pind_list.wxml @@ -2,7 +2,7 @@ - + @@ -16,7 +16,7 @@ {{item.title}} - + 已拼11{{item.buy_num}}份 @@ -72,11 +72,11 @@ + src="{{type==1?'{{url}}/miniapp/images/fire-red.png':'{{url}}/miniapp/images/fire-black.png'}}"> 火热进行中 + src="{{type==0?'{{url}}/miniapp/images/clock-rad.png':'{{url}}/miniapp/images/clock-black.png'}}"> 即将开始 diff --git a/pages/activity/seckill_list/seckill_list.wxml b/pages/activity/seckill_list/seckill_list.wxml index 303b3bb..f248cdd 100644 --- a/pages/activity/seckill_list/seckill_list.wxml +++ b/pages/activity/seckill_list/seckill_list.wxml @@ -1,14 +1,14 @@ - + - + @@ -57,11 +57,11 @@ + src="{{type==1?'{{url}}/miniapp/images/fire-red.png':'{{url}}/miniapp/images/fire-black.png'}}"> 火热进行中 + src="{{type==0?'{{url}}/miniapp/images/clock-rad.png':'{{url}}/miniapp/images/clock-black.png'}}"> 即将开始 diff --git a/pages/index/index/index.wxml b/pages/index/index/index.wxml index f654cc3..328438c 100644 --- a/pages/index/index/index.wxml +++ b/pages/index/index/index.wxml @@ -1,20 +1,23 @@ - + + + - + - + - + + - + 扫一扫 @@ -72,7 +75,7 @@ - + Г @@ -98,21 +101,21 @@ - + 护肤 - + 彩妆 - + 面膜 @@ -120,7 +123,7 @@ - + 个人护理 @@ -128,14 +131,14 @@ - + 男士专区 - + @@ -145,8 +148,8 @@ - - + + 查看全部 @@ -194,9 +197,9 @@ - - - + + + 张大仙 刚拼团成功 @@ -227,12 +230,12 @@ - + 已拼11{{aitem.buy_num}}份 - + {{aitem.ct_num}}人团 @@ -427,7 +430,7 @@ - + 黑卡省11.9元 diff --git a/pages/index/index/index.wxss b/pages/index/index/index.wxss index 570c8ed..1182297 100644 --- a/pages/index/index/index.wxss +++ b/pages/index/index/index.wxss @@ -1,3 +1,6 @@ +.pink-b{ + background: #ff7295; +} .search-box { position: fixed; @@ -38,17 +41,19 @@ margin-left: 36rpx; display: flex; align-items: center; -position: absolute - +position: absolute; +left: 10%; } .search-cont { height: 58rpx; - width: 536rpx; + width: 530rpx; padding-left: 12rpx; line-height: 58rpx; font-size: 24rpx; color: #666; + margin-left: 56rpx; + } .search-fixed { @@ -73,6 +78,8 @@ position: absolute height: 380rpx; display: inline-block; overflow: hidden; + border-radius: 14rpx; + } .venues_box { @@ -328,6 +335,7 @@ line-height: 25rpx; .slide-image-frame{ width: 95%; margin: auto; +border-radius: 10rpx; } .xc-hook{ @@ -520,23 +528,20 @@ margin-top: 10rpx; height: 40rpx; color: rgb(51,51, 51); } - +.title .China .line view{ + border-left: 3rpx solid #000; + margin-left: 5rpx; +} .title .China .line .one { height: 23rpx; - background-color: #000; - margin-left: 5rpx; } .title .China .line .two { height: 15rpx; - background-color: #000; - margin-left: 5rpx; } .title .China .line .three { height: 18rpx; - background-color: #000; - margin-left: 5rpx; } .title .China .Recommend { @@ -685,4 +690,8 @@ left: 43%; width:108rpx;height:20rpx; border-radius: 20rpx;background:#e0e0e0;line-height: 20rpx; bottom: 25rpx; left: 43%; +} +.mar-top{ + margin-top: 20rpx; + } \ No newline at end of file