diff --git a/components/coupons/index.wxml b/components/coupons/index.wxml index 007d323..c1e332f 100644 --- a/components/coupons/index.wxml +++ b/components/coupons/index.wxml @@ -1,4 +1,4 @@ - + @@ -9,7 +9,7 @@ {{data.subTitle}} - {{data.salePriceStr}} + {{data.salePriceStr}} {{data.priceStr}}元 {{data.priceStr}}小时 @@ -34,4 +34,4 @@ - \ No newline at end of file + diff --git a/components/coupons/index.wxss b/components/coupons/index.wxss index e326503..f148a33 100644 --- a/components/coupons/index.wxss +++ b/components/coupons/index.wxss @@ -1,15 +1,12 @@ @import "../../app.wxss"; .coupons { - width: 40%; - height: 492rpx; + width: 335rpx; display: inline-block; - padding: 10rpx 30rpx; position: relative; } .coupons-border { height: 1rpx; - /* width: 100%; */ left: 30rpx; right: 30rpx; background: #f5f5f5; @@ -19,31 +16,27 @@ .coupons-img { - width: 180rpx; - height: 180rpx; - border: 1px solid #f8f8f8; border-radius: 10rpx; } .coupons-img image { display: block; - width: 334rpx; - height: 335rpx; + width: 335rpx; + height: 203rpx; + border-top-left-radius: 10rpx; + border-top-right-radius: 10rpx; } .coupons-info { width: 335rpx; - height: 157rpx; - position: absolute; - bottom: 10rpx; - background: #fff; + height: 152rpx; border-radius:0rpx 0rpx 10rpx 10rpx; + background: #fff; } .coupons-info-name { font-size: 28rpx; - font-weight: bold; - color: #343434; + color: #333333; letter-spacing: 0; line-height: 38rpx; } @@ -61,30 +54,26 @@ display: block; font-size: 50rpx; color: #FF4949; - position: absolute; - bottom: 10rpx; } .price{ - /* width:48rpx; -height:26rpx; */ -font-size:34rpx; -font-family:PingFang-SC-Bold; -font-weight:bold; -color:rgba(255,50,50,1); -line-height:44rpx; -margin-left: 16rpx; + font-size:34rpx; + font-family:PingFang-SC-Bold; + font-weight:bold; + color:rgba(255,50,50,1); + line-height:44rpx; + margin-left: 16rpx; + padding-top: 16rpx; } .tit { overflow: hidden; white-space: nowrap; text-overflow: ellipsis; - width: 300rpx; - height: 42rpx; - font-size: 30rpx; - color: #000; + font-size: 28rpx; + line-height: 30rpx; + padding-top: 20rpx; + padding-left: 10rpx; + color: #333; letter-spacing: 0; - font-family: PingFangSC-Medium; - margin: 20rpx 18rpx 13rpx 16rpx; } .coupons-info-price-o { @@ -114,7 +103,7 @@ margin-left: 16rpx; .coupons-btn { position: absolute; - bottom: 10rpx; + bottom: 0; right: 0; } @@ -123,9 +112,7 @@ margin-left: 16rpx; border-radius: 10px 0px 5px 0px !important; margin: 0 !important; padding: 0 !important; - font-family: PingFangSC-Semibold; font-size: 26rpx; - font-weight: 400; color: #fff !important; letter-spacing: 0; height: 51rpx !important; @@ -151,16 +138,14 @@ margin-left: 16rpx; .subtitle { font-size: 24rpx; - color: #919191; + color: #999999; overflow: hidden; + height: 24rpx; + padding-left: 10rpx; + line-height: 24rpx; white-space: nowrap; text-overflow: ellipsis; - width: 300rpx; - height: 23rpx; - line-height: 23rpx; - font-weight:lighter; - margin-bottom: 18rpx; - margin: 0 37rpx 20rpx 18rpx; + margin-top: 12rpx; } .coupons-info-manjian { @@ -266,3 +251,9 @@ scroll-view { opacity: 1!important; background: #fff; } +navigator{ + display: inline-block; +} +navigator:nth-of-type(2n+1){ + margin-right: 10rpx; +} diff --git a/config/config.js b/config/config.js index 6bf4087..d71716e 100755 --- a/config/config.js +++ b/config/config.js @@ -34,7 +34,7 @@ var config = { /** * 业态查询 */ - businessList: "/wxBusiness/list", + businessList: "/wxBusiness/listAll", /** * 频道查询 */ diff --git a/dist/tab/index.wxss b/dist/tab/index.wxss index 1a692d3..aefd529 100644 --- a/dist/tab/index.wxss +++ b/dist/tab/index.wxss @@ -21,23 +21,26 @@ position: absolute; bottom: 0; left: 25%; - background: #00C0FF; + background: #af6e34; border-radius: 100px; } .i-tabs-tab-title { - font-size: 28rpx; + font-size: 30rpx; + line-height: 30rpx; text-align: center; box-sizing: border-box; - color: #222222; + color: #666666; } .i-tabs-tab-title-current { - color: #00C0FF; + color: #af6e34; + font-size: 36rpx; } .i-tabs-tab-scroll { display: inline-block; width: auto; - min-width: 70px; + min-width:75rpx; + margin-right:33rpx; } \ No newline at end of file diff --git a/dist/tabs/index.wxss b/dist/tabs/index.wxss index 1d36704..7885846 100644 --- a/dist/tabs/index.wxss +++ b/dist/tabs/index.wxss @@ -22,16 +22,17 @@ transform-origin: 0 0; pointer-events: none; box-sizing: border-box; - border: 0 solid #e9eaec; + /* border: 0 solid #e9eaec; */ border-bottom-width: 1px } .i-tabs-scroll { display: block; overflow-x: auto; + margin-bottom: 22rpx; white-space: nowrap; /* box-shadow:0 0 2px 0 rgba(211,211,211,0.50); */ - border-bottom: 1rpx solid #eeeeee; + /* border-bottom: 1rpx solid #eeeeee; */ } .i-tabs-fixed { diff --git a/ext.json b/ext.json index 977b5f8..5a1deff 100644 --- a/ext.json +++ b/ext.json @@ -4,7 +4,7 @@ "ext": { "weappId": "wxea71200db93d756b", "name": "富茂客官开发", - "appVersion": "C.4.2.100", + "appVersion": "C.4.2.105", "attr": { "configUrl": "https://ciformall.youlane.cn/C/api", "socketUrl": "wss://mp.youlane.cn/W/ws", diff --git a/pages/discountCardList/discountCardList.js b/pages/discountCardList/discountCardList.js index f2efda5..80d29c9 100644 --- a/pages/discountCardList/discountCardList.js +++ b/pages/discountCardList/discountCardList.js @@ -47,17 +47,12 @@ Page({ onShow: function () { let that = this; Http.get({ - url: config.api.businessList, - data: { - pageNum: 1, - pageSize: 15, - type: 1 - } + url: config.api.businessList }).then(res => { console.log(res) - let businessObj = [{ id: 0, title: "全部", type: 1 }]; + let businessObj = [{ id: 0, title: "全部", type: 1, createDate: 0}]; that.setData({ - tabs: res.data.list.concat(businessObj).sort(compare("id")) + tabs: res.data.list.concat(businessObj).sort(compare("createDate")) }); console.log(that.data.tabs) }) diff --git a/pages/discountCardList/discountCardList.wxml b/pages/discountCardList/discountCardList.wxml index c57df6a..4489a40 100644 --- a/pages/discountCardList/discountCardList.wxml +++ b/pages/discountCardList/discountCardList.wxml @@ -1,9 +1,11 @@ - - - + + + + + diff --git a/pages/discountCardList/discountCardList.wxss b/pages/discountCardList/discountCardList.wxss index fbe3d38..178befc 100644 --- a/pages/discountCardList/discountCardList.wxss +++ b/pages/discountCardList/discountCardList.wxss @@ -242,3 +242,6 @@ button::after{ border: none; } width: 60rpx; height: 60rpx; } +.tabss{ + padding: 0 30rpx; +} \ No newline at end of file diff --git a/pages/index/searchbar/index.js b/pages/index/searchbar/index.js index 1adbe47..8b82e2b 100644 --- a/pages/index/searchbar/index.js +++ b/pages/index/searchbar/index.js @@ -56,16 +56,11 @@ Page({ let that = this; Http.get({ url: config.api.businessList, - data: { - pageNum: 1, - pageSize: 15, - type: 1 - } }).then(res => { console.log(res) - let businessObj = [{ id: 0, title: "全部", type: 1 }]; + let businessObj = [{ id: 0, title: "全部", type: 1, createDate:0}]; that.setData({ - lists: res.data.list.concat(businessObj).sort(compare("id")) + lists: res.data.list.concat(businessObj).sort(compare("createDate")) }); console.log(that.data.lists); }) diff --git a/pages/main/bargain/index.wxml b/pages/main/bargain/index.wxml index 7a6830f..2754a28 100644 --- a/pages/main/bargain/index.wxml +++ b/pages/main/bargain/index.wxml @@ -1,16 +1,17 @@ - 砍价专场更多砍价> + 砍价专场更多砍价> + {{item.title}} - 可砍至{{item.salePriceStr}}元 + {{item.salePriceStr}}元{{item.priceStr}}元 - + \ No newline at end of file diff --git a/pages/main/bargain/index.wxss b/pages/main/bargain/index.wxss index 21872cd..6ed057e 100644 --- a/pages/main/bargain/index.wxss +++ b/pages/main/bargain/index.wxss @@ -1,10 +1,10 @@ .index-rushToBuy { - width: 690rpx; - margin: 30rpx auto; - font-family: PingFangSC-Semibold; - border:1rpx solid rgba(56, 56, 56, 0.11); -box-shadow:6rpx 6rpx 8rpx 1rpx rgba(56,56,56,0.08); -border-radius:16rpx; + width: 690rpx; + margin: 40rpx auto; + padding: 20rpx 0 0; + font-family: PingFangSC-Semibold; + box-shadow:0 0 10px 0 rgba(211,211,211,0.50); + border-radius:16rpx; } .index-rushToBuy-title { @@ -13,18 +13,19 @@ border-radius:16rpx; font-weight:bold; color: #333333; letter-spacing: 1.16rpx; - padding-left: 30rpx; + padding-left: 20rpx; + line-height: 34rpx; } .useprice{ font-size: 28rpx; } .morebargin{ - float: right; - margin-right: 20rpx; - color: #999999; - font-size: 24rpx; - margin-top: 8rpx; - font-weight: normal; + float: right; + margin-right: 20rpx; + color: #999999; + font-size: 24rpx; + line-height: 24rpx; + font-weight: normal; } .listimage{ position: absolute; @@ -35,32 +36,27 @@ border-radius:16rpx; .index-scroll-view { width: 100%; white-space: nowrap; - padding-bottom: 10rpx; - /* background:linear-gradient(94deg,rgba(255,143,0,1) 0%,rgba(255,87,0,1) 100%); */ } - .index-scroll-view .commodity { - display: inline-block; - margin: 16rpx 30rpx 16rpx; - margin-right: 0; - position: relative; - background: #fff; - padding: 12rpx 12rpx 0; - /* border: 1rpx solid #dddee1; */ - width: 205rpx; - box-shadow: 0 0 10px 0 rgba(211,211,211,0.30); - border-radius: 10rpx; - overflow: hidden; + display: inline-block; + width: 285rpx; + margin: 20rpx 0 0 13rpx; + position: relative; + border-radius: 10rpx; + overflow: hidden; } .index-scroll-view .commodity:last-child{ - margin-right: 30rpx; + margin-right: 15rpx; +} +.index-scroll-view .commodity:nth-of-type(1){ + margin-left: 14rpx; } .commodity-img{ display: block; - width: 205rpx; - height: 160rpx; + width: 285rpx; + height: 166rpx; background:rgba(255,255,255,1); - border-radius:10rpx; + border-radius:16rpx; } .index-scroll-view .commodity-info { @@ -69,12 +65,14 @@ border-radius:16rpx; } .index-scroll-view .commodity-info-name { + width: 285rpx; + overflow: hidden; white-space: nowrap; text-overflow: ellipsis; - font-size: 24rpx; - color: #000000; - letter-spacing: 0.7rpx; - overflow: hidden; + font-size: 28rpx; + line-height: 30rpx; + margin-top: 16rpx; + color: #333333; } .index-scroll-view .commodity-info-time { @@ -85,9 +83,13 @@ border-radius:16rpx; } .index-scroll-view .commodity-info-price-p { - font-size: 24rpx; + font-size: 28rpx; color: #f96563; - line-height: 36rpx; + line-height: 30rpx; +} +.commodity-info-price{ + margin-top: 10rpx; + line-height: 30rpx; } .index-scroll-view .commodity-info-price-o { display: inline-block; @@ -98,18 +100,21 @@ border-radius:16rpx; text-decoration:line-through; line-height: 36rpx; } -.commodity-info-price{ - line-height: 36rpx; -} .barginicon{ width: 24rpx; height: 22rpx; } .barginiconimg{ - width: 24rpx; - height: 22rpx; - margin-right: 2rpx; + width: 26rpx; + height: 23rpx; + margin-right: 6rpx; } .text-red{ color:#F12643; +} +.price{ + font-size: 24rpx; + color: #999; + text-decoration: line-through; + margin-left: 10rpx; } \ No newline at end of file diff --git a/pages/main/coupons/index.js b/pages/main/coupons/index.js index cdd309a..31e26b3 100644 --- a/pages/main/coupons/index.js +++ b/pages/main/coupons/index.js @@ -183,17 +183,12 @@ Component({ Http.setToken(token); // business获取 Http.get({ - url: config.api.businessList, - data: { - pageNum: 1, - pageSize: 15, - type: 1 - } + url: config.api.businessList }).then(res => { console.log(res) - let businessObj = [{id:0,title: "全部",type: 1}]; + let businessObj = [{ id: 0, title: "全部", type: 1, createDate:0}]; that.setData({ - tabs: res.data.list.concat(businessObj).sort(compare("id")) + tabs: res.data.concat(businessObj).sort(compare("createDate")) }); console.log(that.data.tabs) }) diff --git a/pages/main/coupons/index.wxml b/pages/main/coupons/index.wxml index 8fa4f32..c05f26a 100644 --- a/pages/main/coupons/index.wxml +++ b/pages/main/coupons/index.wxml @@ -2,7 +2,9 @@ - + + + 请您敬请期待 diff --git a/pages/main/coupons/index.wxss b/pages/main/coupons/index.wxss index 94bc1fd..d315397 100644 --- a/pages/main/coupons/index.wxss +++ b/pages/main/coupons/index.wxss @@ -1,9 +1,8 @@ +@import "../../../app.wxss"; .index-coupons { - /* height: 820rpx; */ - /* margin-top: 30rpx; */ - background:linear-gradient(0deg,rgba(235,235,235,1) 0%,rgba(255,255,255,1) 100%); + padding: 0 30rpx; + background:linear-gradient(0deg,rgba(235,235,235,1) 0%,rgba(255,255,255,0.8) 100%); } - .loading { text-align: center; height: 80rpx; @@ -11,7 +10,17 @@ font-size: 26rpx; color: #999; } - +.coupons c-coupons{ + width: 335rpx; + height: 354rpx; + margin-bottom: 22rpx; +} +.coupons c-coupons:nth-of-type(2n+1){ + float: left; +} +.coupons c-coupons:nth-of-type(2n){ + float: right; +} .loading image { width: 60rpx; height: 60rpx; @@ -19,9 +28,9 @@ margin-right: 10rpx; } -.dingdan { +/* .dingdan { margin-top: 33rpx; -} +} */ .dingdan text:nth-of-type(1) { display: block; diff --git a/pages/main/index.wxml b/pages/main/index.wxml index 0486345..9870ed1 100644 --- a/pages/main/index.wxml +++ b/pages/main/index.wxml @@ -1,21 +1,28 @@ - - + + + - - + + + {{levelName}} - 积分 - 5000 - 成长值{{score}} - + 成长值{{score}} + + + + + 积分 + 5000 + - - + + + @@ -36,7 +43,7 @@ - + @@ -45,7 +52,6 @@ -