diff --git a/app.wxss b/app.wxss index 6a43593..3ed4e53 100644 --- a/app.wxss +++ b/app.wxss @@ -312,9 +312,12 @@ color: #b9b9b9; position: fixed; } -.yellow{ +.yellow-b{ background-color: #ffb03f; } +.yellow-co{ + color: #ffb03f; +} .green{ background-color: #16ba63; } @@ -346,4 +349,4 @@ background: #ffe3e2; } .fs40 { font-size: 40rpx; -} \ No newline at end of file +} diff --git a/images/00.png b/images/00.png new file mode 100644 index 0000000..1e1ea25 --- /dev/null +++ b/images/00.png diff --git a/images/111.png b/images/111.png new file mode 100644 index 0000000..7267fec --- /dev/null +++ b/images/111.png diff --git a/images/classify.png b/images/classify.png new file mode 100644 index 0000000..4e2ef2d --- /dev/null +++ b/images/classify.png diff --git a/images/clock-black.png b/images/clock-black.png new file mode 100644 index 0000000..9ad6a5a --- /dev/null +++ b/images/clock-black.png diff --git a/images/clock-rad.png b/images/clock-rad.png new file mode 100644 index 0000000..ea8ec29 --- /dev/null +++ b/images/clock-rad.png diff --git a/images/cosmetics.png b/images/cosmetics.png new file mode 100644 index 0000000..0f36053 --- /dev/null +++ b/images/cosmetics.png diff --git a/images/fire-black.png b/images/fire-black.png new file mode 100644 index 0000000..d7656b9 --- /dev/null +++ b/images/fire-black.png diff --git a/images/fire-red.png b/images/fire-red.png new file mode 100644 index 0000000..8f1baf9 --- /dev/null +++ b/images/fire-red.png diff --git a/images/fril.png b/images/fril.png new file mode 100644 index 0000000..d45e283 --- /dev/null +++ b/images/fril.png diff --git a/images/man_region.png b/images/man_region.png new file mode 100644 index 0000000..cc351cf --- /dev/null +++ b/images/man_region.png diff --git a/images/mask.png b/images/mask.png new file mode 100644 index 0000000..18e57ac --- /dev/null +++ b/images/mask.png diff --git a/images/nursing.png b/images/nursing.png new file mode 100644 index 0000000..177bd27 --- /dev/null +++ b/images/nursing.png diff --git a/images/scanning.png b/images/scanning.png new file mode 100644 index 0000000..c7b79d0 --- /dev/null +++ b/images/scanning.png diff --git a/images/seckill-ttitle.png b/images/seckill-ttitle.png new file mode 100644 index 0000000..f379e82 --- /dev/null +++ b/images/seckill-ttitle.png diff --git a/images/seckill_top_img.jpg b/images/seckill_top_img.jpg new file mode 100644 index 0000000..2388c60 --- /dev/null +++ b/images/seckill_top_img.jpg diff --git a/images/skincare.png b/images/skincare.png new file mode 100644 index 0000000..d4146ce --- /dev/null +++ b/images/skincare.png diff --git a/images/team.jpg b/images/team.jpg new file mode 100644 index 0000000..28c87fe --- /dev/null +++ b/images/team.jpg diff --git a/images/title.png b/images/title.png new file mode 100644 index 0000000..8a07667 --- /dev/null +++ b/images/title.png diff --git a/images/top-img.png b/images/top-img.png new file mode 100644 index 0000000..82fc76a --- /dev/null +++ b/images/top-img.png diff --git a/images/zms.png b/images/zms.png new file mode 100644 index 0000000..9540ef3 --- /dev/null +++ b/images/zms.png diff --git a/pages/activity/pind_list/pind_list.js b/pages/activity/pind_list/pind_list.js index 8c8ac17..f19a268 100644 --- a/pages/activity/pind_list/pind_list.js +++ b/pages/activity/pind_list/pind_list.js @@ -1,4 +1,7 @@ -var e = getApp(), i = e.request, a = e.globalData.setting,os=a,ut = require("../../../utils/util.js"); +var e = getApp(), +i = e.request, + a = e.globalData.setting, + os=a,ut = require("../../../utils/util.js"); var regeneratorRuntime = require('../../../utils/runtime.js'); Page({ @@ -11,6 +14,7 @@ Page({ timer:null, ismore:1, isshow:0, + iurl: os.imghost, }, onShow: function(t) { diff --git a/pages/activity/pind_list/pind_list.wxml b/pages/activity/pind_list/pind_list.wxml index 2ebf03f..edfbaae 100644 --- a/pages/activity/pind_list/pind_list.wxml +++ b/pages/activity/pind_list/pind_list.wxml @@ -1,38 +1,65 @@ - - - 进行中 - 即将开始 - - + + + + + + + + + - + - 商家团 - 会员团 - 阶梯团 + {{item.title}} - 已团{{item.buy_num}}件 {{item.ct_num}}人团 - - - ￥{{item.price}}￥{{item.market_price}} - + + + + 已拼11{{item.buy_num}}份 + + + + + {{item.ct_num}}人团 + + + 距开始: {{item.djs.day}}天 {{item.djs.hou}}时 {{item.djs.min}}分 {{item.djs.sec}}秒 + + + + + {{item.djs.day}}天 + {{item.djs.hou}}时 + {{item.djs.min}}分 + {{item.djs.sec}}秒 + + + + + + ￥ + {{item.price}} + 零售价￥{{item.market_price}} + + - - 去参团 - 去开团 - 去开团 + + 即将开始 + 即将开始 + 即将开始 - 去参团 + 去参团 去开团 去开团 @@ -42,6 +69,21 @@ + + + + + + 火热进行中 + + + 即将开始 + + + 没有相关内容 + \ No newline at end of file diff --git a/pages/activity/pind_list/pind_list.wxss b/pages/activity/pind_list/pind_list.wxss index d1cba2a..ad33896 100644 --- a/pages/activity/pind_list/pind_list.wxss +++ b/pages/activity/pind_list/pind_list.wxss @@ -1,35 +1,60 @@ +page{ + background: #eee +} +.kill-list{ + width: 95%; + margin-top: -50rpx; + position:absolute; + left: 2.5%; + height: 807rpx; +overflow-y: scroll; + + +} .kill-time { text-align: center; justify-content: space-around; align-items: center; - height: 178rpx; + height: 101rpx; border-bottom: 1px solid #ddd; border-top: 1px solid #ddd; background-color: #f6f6f6; } .kill-time .theader{ - width: 86%; display: flex; margin: 0 auto; + display: flex; margin: 0 auto; align-items: center; + height: 100rpx; + } + .kill-time .theader .timeac { - font-size: 32rpx; height: 78rpx; line-height:78rpx; width: 50%; margin-top: 50rpx; + font-size: 32rpx; height:100%; width: 50%; color: #333; background-color: #fff; + } -.kill-time .theader .timeac.left{border-top-left-radius: 86rpx; border-bottom-left-radius: 86rpx;} -.kill-time .theader .timeac.right{border-top-right-radius: 86rpx; border-bottom-right-radius: 86rpx;} -.kill-time .theader .timeac.active{background-color: #c4182e;color: #fff} + +/* .kill-time .theader .timeac.left{border-top-left-radius: 86rpx; border-bottom-left-radius: 86rpx;} +.kill-time .theader .timeac.right{border-top-right-radius: 86rpx; border-bottom-right-radius: 86rpx;} */ +.kill-time .theader .timeac.active{color: #c4182e} + .kill-item { - display: flex; + display: flex; justify-content: space-between; background-color: #fff; padding: 10rpx 20rpx; margin-bottom: 10rpx; + border-radius: 10rpx; + height: 249rpx; + align-items: center; + padding-left: 20rpx; + + } .kill-pic { - width: 200rpx; - height: 200rpx; + width: 215rpx; + height: 215rpx; position: relative; } @@ -40,23 +65,28 @@ } .kill-cont { - width: 480rpx; + width: 440rpx; + height: 215rpx; + margin-left: 16rpx; } .goods-name { - height: 48rpx; - line-height: 48rpx; - font-size: 24rpx; - color: #555; + max-height: 60rpx; + margin-bottom: 18rpx; + font-size: 27rpx; + color: #555; + line-height: 30rpx; + } .goods-num { - padding-top: 10rpx; + height: 50rpx; display: flex; justify-content: space-between; - line-height: 42rpx; +margin-top: 10rpx; font-size: 24rpx; color: #999; + } .goods-num .co-red { @@ -70,12 +100,18 @@ .kill-btn { text-align: right; + padding-top: 15rpx; + } + .kill-btn>navigator { padding: 0 20rpx; background: #e23245; color: #fff; + border-radius: 20rem; +line-height: 43rpx; +margin-top: 4rpx; } .kill-btn .gray { @@ -89,5 +125,72 @@ color: #333; } -.kill-btn>navigator.huise{background-color: gainsboro;} -.tneirong{color:#555; font-size: 21rpx;} \ No newline at end of file +.kill-btn>navigator.huise{background-color:#999999;} +.tneirong{ + color:#fff; + font-size: 20rpx; + border-radius:20rpx; + padding-left: 32rpx; + padding-right: 15rpx; + padding-bottom: 2rpx; + height: 28rpx; + line-height: 28rpx; + + + } +.body_frame { +width: 100%; +height: 100%; + +} +.xc-top-img{ + width: 100%; + height: 333rpx; + margin-top: 5rpx; + +} +.xc-seckill-bottom{ + position: fixed; +bottom: 0rpx; +width: 100%; +} +.xc-bottom{ + width: 45rpx; + height: 45rpx; + margin-right: 13rpx; +} +.xc-border-right{ + border-right: 4rpx solid #eee; +} +.xc-team-img{ +width:38rpx; +height: 45rpx; +left: -1rpx; +top: -16rpx; +} + +.xc-people-val-frame{ + border: 3rpx solid #d60021;border-radius: 8rpx;overflow: hidden; + +} +.xc-people-val-frame .val-img{ +width:33rpx;height:28rpx;border-radius: 8rpx;margin-left: -2rpx; +} +.xc-top15{ + padding-top: 15rpx; + margin-top: 4rpx; +} +.people-img{ + width:20rpx;height:20rpx +} +.time-blue{ +margin-left: 10rpx; +} +.martop13{ +margin-top: 13rpx; + +} +.martop18{ +margin-top: 18rpx; + +} \ No newline at end of file diff --git a/pages/activity/seckill_list/seckill_list.wxml b/pages/activity/seckill_list/seckill_list.wxml index 7a29f65..c62cf6a 100644 --- a/pages/activity/seckill_list/seckill_list.wxml +++ b/pages/activity/seckill_list/seckill_list.wxml @@ -1,36 +1,73 @@ - - - 秒杀中 - 即将秒杀 - - - + + + + + + + - + + {{item.title}} + + + + + + + 剩余{{type==1?100-item.buy_num/item.goods_num*100:'100'}}% + + + + 已抢{{item.buy_num}}件 + + + - ￥{{item.price}}￥{{item.market_price}} - - {{item.djs.day}}天 + + 剩余: + {{item.djs.day}}天 {{item.djs.hou}}时 {{item.djs.min}}分 {{item.djs.sec}}秒 + + ￥ + {{item.price}} + 零售价￥{{item.market_price}} + - 马上抢 + 立即开始 马上抢 - 已抢光 + 已抢光 + + + + + + 火热进行中 + + + 即将开始 + + + + 没有相关内容 + + diff --git a/pages/activity/seckill_list/seckill_list.wxss b/pages/activity/seckill_list/seckill_list.wxss index 7b82501..acbcc0a 100644 --- a/pages/activity/seckill_list/seckill_list.wxss +++ b/pages/activity/seckill_list/seckill_list.wxss @@ -1,45 +1,84 @@ + page{ + background: #eee; + color: #333; + } + .body_frame{ + width: 100%; + height: 100%; + + } +.xc-top-img{ + width: 100%; + height: 333rpx; + margin-top: 5rpx; + +} +.kill-list{ + height: 807rpx; +overflow-y: scroll; +} +.seckill_list{ +position: absolute; +margin-top: -50rpx; +left: 2%; + +} +.seckill{ + width: 95%; +margin: auto; + +} .kill-time { text-align: center; justify-content: space-around; align-items: center; - height: 178rpx; + height: 101rpx; border-bottom: 1px solid #ddd; border-top: 1px solid #ddd; background-color: #f6f6f6; } .kill-time .theader{ - width: 86%; display: flex; margin: 0 auto; + display: flex; margin: 0 auto; align-items: center; + height: 100rpx; + } .kill-time .theader .timeac { - font-size: 32rpx; height: 78rpx; line-height:78rpx; width: 50%; margin-top: 50rpx; + font-size: 32rpx; height:100%; width: 50%; color: #333; background-color: #fff; + } -.kill-time .theader .timeac.left{border-top-left-radius: 86rpx; border-bottom-left-radius: 86rpx;} -.kill-time .theader .timeac.right{border-top-right-radius: 86rpx; border-bottom-right-radius: 86rpx;} -.kill-time .theader .timeac.active{background-color: #c4182e;color: #fff} +/* .kill-time .theader .timeac.left{border-top-left-radius: 86rpx; border-bottom-left-radius: 86rpx;} +.kill-time .theader .timeac.right{border-top-right-radius: 86rpx; border-bottom-right-radius: 86rpx;} */ +.kill-time .theader .timeac.active{color: #c4182e} .kill-item { display: flex; justify-content: space-between; background-color: #fff; - padding: 10rpx 20rpx; + padding: 10rpx 10rpx; margin-bottom: 10rpx; + border-radius: 10rpx; + height: 249rpx; + align-items: center; } .kill-pic { - width: 200rpx; - height: 200rpx; + width: 215rpx; + height: 215rpx; } .kill-cont { - width: 480rpx; + width: 465rpx; + margin-left:20rpx; + margin-right: 5rpx; } .goods-name { - height: 96rpx; - line-height: 48rpx; - font-size: 24rpx; + max-height: 60rpx; + font-size: 27rpx; color: #555; + line-height: 30rpx; + } .goods-num { @@ -57,17 +96,28 @@ } .underline { - text-decoration: line-through; color:#999999; font-size: 20rpx; margin-left: 5rpx; + text-decoration: line-through; + color:#999999; font-size: 20rpx; + margin-left: 10rpx; + line-height: 30rpx; } .kill-btn { text-align: right; + display: flex; +height: 100%; +align-items: flex-end; +padding-top: 4rpx; + } .kill-btn>navigator { padding: 0 20rpx; background: #e23245; color: #fff; + border-radius: 20rpx; + margin-top: 37px; + } .kill-btn .gray { @@ -81,4 +131,51 @@ color: #333; } -.kill-btn>navigator.huise{background-color: gainsboro;} \ No newline at end of file +.kill-btn>navigator.huise{background-color: #999;} +.xc-seckill-bottom{ + position: fixed; +bottom: 0rpx; +width: 100%; + +} +.xc-bottom{ + width: 45rpx; + height: 45rpx; + margin-right: 13rpx; +} +.xc-border-right{ + border-right: 4rpx solid #eee; + +} +.ml10{ +margin-left: 45rpx; +} +.total{ + width:215rpx;height:26rpx;border-radius:20rpx; + background: #ffe3e2; +} +.xc-buttom-money{ + align-items: baseline; +padding-top: 43rpx; +} + +.xc-miaosha{ +width: 50rpx; +height: 40rpx; + +} +.xc-strip-frame{ + width:440rpx;margin-top: 10rpx; +} +.xc-strip-blank{ + width:180rpx; +height: 26rpx; +} +.xc-fill{ +border-radius:20rpx;height:26rpx; +} +.xc-fill-text{ + left:34%; + line-height: 26rpx; + +} \ No newline at end of file diff --git a/pages/goods/goodsInfo/goodsInfo.wxss b/pages/goods/goodsInfo/goodsInfo.wxss index fe8c3ef..2437feb 100644 --- a/pages/goods/goodsInfo/goodsInfo.wxss +++ b/pages/goods/goodsInfo/goodsInfo.wxss @@ -1139,7 +1139,7 @@ left:31rpx;} width: 100%; height: 42rpx; padding-left: 34rpx; - color: #948485; + color: #333; } .xc_comment-have-pictures{ diff --git a/pages/index/index/index.js b/pages/index/index/index.js index 85d134c..8a49524 100644 --- a/pages/index/index/index.js +++ b/pages/index/index/index.js @@ -42,14 +42,24 @@ Page({ isTemplate:0, template_arr:null, bgcolor_t:'', - - }, + onLoad: function () { + + wx.setNavigationBarColor({ + frontColor: '#ff7295', + backgroundColor: '#000', + + }); + + var th = this; n.init(th, "", "recommend"); + + }, async onShow() { + await this.init_load(); //显示的时候要开启计时器 this.data.is_timer=1; @@ -450,6 +460,7 @@ Page({ } setTimeout(th.countDown2, 1000); }, + }); \ No newline at end of file diff --git a/pages/index/index/index.json b/pages/index/index/index.json index 7b00316..907ebab 100644 --- a/pages/index/index/index.json +++ b/pages/index/index/index.json @@ -1,5 +1,6 @@ { - "navigationBarBackgroundColor": "#eeeeee", + "navigationBarBackgroundColor": "#ff7295", + "navigationBarTextStyle": "white", "usingComponents": { "nav": "/components/diy_nav/diy_nav", "advertising":"/components/diy_advertising/diy_advertising", diff --git a/pages/index/index/index.wxml b/pages/index/index/index.wxml index 7d8f151..2ced935 100644 --- a/pages/index/index/index.wxml +++ b/pages/index/index/index.wxml @@ -1,21 +1,30 @@ - + + - + + + + 分类 + + + + 扫一扫 + - + - + - + @@ -56,19 +65,93 @@ + + + + + Г + + 人工优先 + + + + + + Г + + 正品保证 + + + + Г + + 售后无忧 + + + + + + + + + 护肤 + + + + + + + 彩妆 + + + + + + + 面膜 + + + + + + + + 个人护理 + + + + + + + + 男士专区 + + + + + + + + + + - - 秒杀特区 + + + + + 查看全部 + - + diff --git a/pages/index/index/index.wxss b/pages/index/index/index.wxss index 879cab3..70c103a 100644 --- a/pages/index/index/index.wxss +++ b/pages/index/index/index.wxss @@ -1,13 +1,17 @@ .search-box { + position: fixed; top: 0; left: 0; width: 100%; height: 88rpx; z-index: 10; - background: linear-gradient(rgba(0,0,0,.2),rgba(255,255,255,0)); + /* background: linear-gradient(rgba(0,0,0,.2),rgba(255,255,255,0)); */ +} +.classify-img{ + width: 50rpx; + height: 45rpx } - .logo { width: 48rpx; height: 48rpx; @@ -19,19 +23,23 @@ .search-inner { display: flex; align-items: center; - margin: 15rpx 30rpx; - width: 675rpx; + margin: 20rpx 25rpx; + width: 566rpx; height: 58rpx; border-radius: 29rpx; background-color: #fff; + justify-content: center; } .search-img { - margin-right: 12rpx; + width: 30rpx; height: 30rpx; - margin-top: -6rpx; - margin-left: 20rpx; + margin-left: 36rpx; +display: flex; +align-items: center; +position: absolute + } .search-cont { @@ -44,7 +52,7 @@ } .search-fixed { - background: rgba(242,48,48,0.8); + background: #ff7295; } .swiper_box { @@ -58,9 +66,11 @@ swiper-item image { width: 100%; - height: 380rpx; + height: 203rpx; display: inline-block; overflow: hidden; + border-radius: 10rpx; + } .venues_box { @@ -221,18 +231,15 @@ swiper-item image { } .seckill-list { - height: 360rpx; + overflow: hidden; } .seckill-list navigator { - width: 236rpx; margin-right: 10rpx; position: relative; + width: 212rpx; position: relative; } -.seckill-list image { - width: 236rpx; - height: 236rpx; -} + .seckill-list view { height: 45rpx; @@ -243,8 +250,8 @@ swiper-item image { } .seckill-list view.imgview{ - width: 236rpx; - height: 236rpx; + width: 203rpx; + height: 226rpx; position: relative; overflow: hidden } @@ -294,3 +301,73 @@ swiper-item image { .arrow-right{width: 30rpx; height: 30rpx;} .pd-view{height: 80rpx;} +.xc-top-img{ +width: 100%; +top: -1rpx; + +height: 315rpx; + +} + +.classify-frame{ +line-height: 25rpx; +} +.slide-image-frame{ + width: 95%; +margin: auto; + +} +.xc-hook{ + width: 30rpx; + height: 30rpx; + transform: rotate(-145deg); +line-height: 35rpx; +text-align: center; + +} +.margin-left{ +margin-left: 10rpx; +} +.xc-class-img{ + width: 83rpx; + height: 83rpx; +} +.xc-class-frame{ + line-height: 40rpx; + margin-top: 40rpx; + +} +.xc-title-img{ + height: 220rpx; + width: 100%; +} + +.title-img-frame{ + width: 95%; +margin: auto; +margin-top: 30rpx; + +} +.seckill-list{ + line-height: 30rpx; + +} + +.xc-marfin-right{ +margin-right: 15rpx; +} +.clock-img{ + width:36rpx; + height: 36rpx; + margin-right: 10rpx; +} +.seckill-ttitle-img{ + width:150rpx; + height: 40rpx; + margin-left: -10rpx; + + +} +.split-line{ + width:100%;height:10rpx;background:#eee; +} \ No newline at end of file diff --git a/pages/team/team_success/team_success.js b/pages/team/team_success/team_success.js index 6686cd0..a6faf67 100644 --- a/pages/team/team_success/team_success.js +++ b/pages/team/team_success/team_success.js @@ -4,7 +4,7 @@ var t = require("../../../utils/util.js"), a = require("../../../utils/wxParse/wxParse.js"), s = getApp(), i = s.request, - rq = i, + rq = i, oo = s.globalData, o = s.globalData.setting, os = o;