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 @@
-
diff --git a/pages/main/index.wxss b/pages/main/index.wxss
index 943d3cf..2eaf5c8 100644
--- a/pages/main/index.wxss
+++ b/pages/main/index.wxss
@@ -55,11 +55,11 @@ page {
position:relative;
margin: 30rpx auto 35rpx;
width: 690rpx;
- height: 124rpx;
-background:rgba(255,255,255,1);
-border:1rpx solid rgba(56, 56, 56, 0.11);
-box-shadow:0rpx 6rpx 8rpx 1rpx rgba(56,56,56,0.08);
-border-radius:16rpx;
+ padding: 20rpx 0;
+ height: 84rpx;
+ box-shadow:0 0 10px 0 rgba(211,211,211,0.50);
+
+ border-radius:16rpx;
}
.section {
padding: 0 20rpx;
@@ -109,8 +109,12 @@ border-radius:16rpx;
}
.qrcode image {
- width: 70rpx;
- margin-right: 20rpx;
+ position: absolute;
+ top: 0;
+ bottom: 0;
+ right: 20rpx;
+ margin: auto;
+ width: 84rpx;
}
.showQrcode {
@@ -138,7 +142,7 @@ border-radius:16rpx;
}
.showQrcode text {
- display: block;
+ display: none;
text-align: center;
font-size: 28rpx;
}
@@ -182,10 +186,10 @@ border-radius:16rpx;
.user-avatar {
position: absolute;
left: 24rpx;
- top:7rpx;
+ top:0;
bottom: 0;
- width: 66rpx;
- height: 66rpx;
+ width: 80rpx;
+ height: 80rpx;
border-radius: 50%;
overflow: hidden;
margin: auto;
@@ -196,34 +200,38 @@ width:100%;
height:100%;
}
.user-data {
- font-family: PingFangSC-Regular;
margin-left: 116rpx;
letter-spacing: 0.64rpx;
line-height: 44rpx;
- margin-top: 15rpx;
font-size: 30rpx;
color: #333;
- font-weight: bold;
}
.chengzhang {
- font-size: 24rpx;
+ font-size: 29rpx;
font-weight: 400;
color: #AF6E34;
- margin-left:9rpx;
}
-.jifen{
+.integral{
margin-left: 70rpx;
+}
+.jifen{
+ display: inline-block;
+ height: 34rpx;
color: #999999;
- font-size: 23rpx;
+ font-size:24rpx;
+ line-height: 34rpx;
}
.jifenNumber{
color:#D18B4C;
font-size: 34rpx;
+ line-height: 34rpx;
margin-left: 10rpx;
+ font-weight: bold;
}
.view {
font-size: 24rpx;
color: #999999;
+ line-height: 24rpx;
}
.view>.score{
margin-left:9rpx;
@@ -232,29 +240,29 @@ height:100%;
margin-right:23rpx;
font-family:PingFang-SC-Bold;
}
-.barcodeimg{
- position: absolute;
- right: 21rpx;
- top: 23rpx;
+.qrcode{
width: 84rpx;
height: 84rpx;
}
-.duihuanimg{
- width: 86rpx;
- height: 63rpx;
- right:190rpx;
-position:absolute;
- top: 60rpx;
+.qrcodeimg{
+ width: 100%;
}
.leftimg{
- position: absolute;
+ position: absolute;
right: 40rpx;
top: 60rpx;
margin-top: -7rpx;
width: 14rpx;
height: 26rpx;
}
+.duihuanimg{
+ display: block;
+ width: 85rpx;
+ height: 61rpx;
+ margin-top: 6rpx;
+}
.product{
+ height: 135rpx;
padding: 0 30rpx;
margin-bottom: 30rpx;
}
@@ -295,4 +303,7 @@ position:absolute;
text-indent: 4em;
border-radius:60rpx;
margin-top: 7rpx;
+}
+.business{
+ margin-top: 40rpx;
}
\ No newline at end of file
diff --git a/pages/main/rushtobyCard/index.js b/pages/main/rushtobyCard/index.js
index 172a7c5..eaf103a 100644
--- a/pages/main/rushtobyCard/index.js
+++ b/pages/main/rushtobyCard/index.js
@@ -23,7 +23,6 @@ Component({
* 组件的方法列表
*/
methods: {
-
rushtobuy: function (e) {
wx.navigateTo({
url: `/pages/coupon/detail/index?couponChannelId=${
@@ -31,7 +30,16 @@ Component({
}&couponId=${e.currentTarget.dataset.couponid}`
})
},
-
+ gotoRushList:function(){
+ wx.navigateTo({
+ url: '/pages/rushToBuy/index',
+ })
+ },
+ gotoCardList:function(){
+ wx.navigateTo({
+ url: '/pages/discountCardList/discountCardList',
+ })
+ },
gotodiscountCardList: function (e) {
wx.navigateTo({
url: `/pages/coupon/detail/index?couponChannelId=${e.currentTarget.dataset.quancode}&couponId=${e.currentTarget.dataset.couponid}&cardType=${e.currentTarget.dataset.type}`
diff --git a/pages/main/rushtobyCard/index.wxml b/pages/main/rushtobyCard/index.wxml
index 834b30c..8cbfbdd 100644
--- a/pages/main/rushtobyCard/index.wxml
+++ b/pages/main/rushtobyCard/index.wxml
@@ -1,40 +1,44 @@
-
-
-
- 限时秒杀
-
-
-
-
-
- {{item.title}}
-
- {{item.salePriceStr}}元
- {{item.priceStr}}元
+
+
+
+
+ 限时
+ 秒杀
+ 更多>
+
+
+
+
+
+ {{list[0].title}}
+
+ {{list[0].salePriceStr}}元
+ {{list[0].priceStr}}元
+
-
+
+
+
+ 消费
+ 卡
+ 更多>
-
-
- 消费 卡好物提前购
-
-
-
-
-
- {{item.title}}
-
- {{item.salePriceStr}}元
- {{item.priceStr}}元
+
+
+
+
+ {{cardlist[0].title}}
+
+ {{cardlist[0].salePriceStr}}元
+ {{cardlist[0].priceStr}}元
+
-
-
-
+
\ No newline at end of file
diff --git a/pages/main/rushtobyCard/index.wxss b/pages/main/rushtobyCard/index.wxss
index 2aa76f0..2e264ad 100644
--- a/pages/main/rushtobyCard/index.wxss
+++ b/pages/main/rushtobyCard/index.wxss
@@ -1,25 +1,33 @@
-
+@import "../../../app.wxss";
.rushtobuyimgs>view{
- width: 48%;
display: inline-block;
+ box-shadow:0 0 10px 0 rgba(211,211,211,0.50);
+ border-radius:16rpx;
+
+}
+.rushtobuyimgs{
+ padding: 0 30rpx;
+ margin-bottom: 40rpx;
}
.rushtobuyimgs>view>text{
- font-size:34rpx;
font-weight: bold;
}
.xianshi{
color: #F12643;
- padding-left:30rpx;
+ font-weight: bold;
+ font-size:34rpx;
+ line-height: 34rpx;
}
.qianggou{
color: #3D3737;
+ font-weight: bold;
+ font-size: 34rpx;
+ line-height: 34rpx;
}
.xiaofei{
color: #3D3737;
padding-left:30rpx;
-}
-.ka{
- color: #ED734A
+ font-size: 34rpx;
}
.subtitle{
font-size:28rpx !important;
@@ -64,13 +72,11 @@
.index-scroll-view .commodity {
display: inline-block;
- margin: 16rpx 30rpx 16rpx;
+ margin: 20rpx 0 16rpx;
margin-right: 0;
position: relative;
background: #fff;
- /* border: 1rpx solid #dddee1; */
width: 334rpx;
- /* box-shadow: 0 0 10px 0 rgba(211,211,211,0.30); */
border-radius: 10rpx;
overflow: hidden;
}
@@ -79,10 +85,10 @@
}
.commodity-img{
display: block;
- width: 335rpx;
- height: 200rpx;
- border-radius: 10rpx;
- border: 1px solid #ebeced;
+ width: 314rpx;
+ height: 174rpx;
+ border-radius: 16rpx;
+ border:1rpx solid #f5f5f5;
}
.index-scroll-view .commodity-info {
@@ -90,18 +96,18 @@
overflow: hidden;
}
-.index-scroll-view .commodity-info-name {
+.commodity-info-name {
font-size: 28rpx;
+ line-height: 28rpx;
color: #333;
- letter-spacing: 0.7rpx;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
- width:248px;
- font-weight: bold;
+ width:318rpx;
+ padding:16rpx 0;
}
-.index-scroll-view .commodity-info-time {
+.commodity-info-time {
font-size: 28rpx;
color: #B4B4B4;
letter-spacing: 0.7rpx;
@@ -109,13 +115,13 @@
font-weight: 500;
}
-.index-scroll-view .commodity-info-price-p {
+.commodity-info-price-p {
font-size: 28rpx;
color: #FF3232;
line-height: 36rpx;
font-weight:500;
}
-.index-scroll-view .commodity-info-price-o {
+.commodity-info-price-o {
display: inline-block;
padding-left: 20rpx;
font-size: 24rpx;
@@ -135,4 +141,14 @@
.realRemainingTime {
color: #ff4949;
font-size: 28rpx;
+}
+.more{
+ float: right;
+ line-height: 34rpx;
+ color: #999999;
+ font-size: 24rpx;
+ font-weight: normal;
+}
+.title{
+ padding: 20rpx 0;
}
\ No newline at end of file
diff --git a/pages/main/spellGroup/index.wxml b/pages/main/spellGroup/index.wxml
index 499d18f..73ba00a 100644
--- a/pages/main/spellGroup/index.wxml
+++ b/pages/main/spellGroup/index.wxml
@@ -1,15 +1,14 @@
- 拼团专场更多拼团>
+
+ 拼团专场更多拼团>
+
-
+
{{item.title}}
-
- {{item.salePriceStr}}元
- {{item.priceStr}}元
-
+ {{item.salePriceStr}}元{{item.priceStr}}元
diff --git a/pages/main/spellGroup/index.wxss b/pages/main/spellGroup/index.wxss
index ec73aa2..6ed057e 100644
--- a/pages/main/spellGroup/index.wxss
+++ b/pages/main/spellGroup/index.wxss
@@ -1,57 +1,62 @@
.index-rushToBuy {
- width: 100%;
- font-family: PingFangSC-Semibold;
+ 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 {
position: relative;
font-size: 34rpx;
- color: #000000;
+ font-weight:bold;
+ color: #333333;
letter-spacing: 1.16rpx;
- padding-top: 0;
- padding-left: 30rpx;
- font-weight: bold;
-}
-.moregroup{
- float: right;
- margin-right: 20rpx;
- color: #999999;
- font-size: 24rpx;
- margin-top: 8rpx;
- font-weight: normal;
+ padding-left: 20rpx;
+ line-height: 34rpx;
+}
+.useprice{
+ font-size: 28rpx;
+}
+.morebargin{
+ float: right;
+ margin-right: 20rpx;
+ color: #999999;
+ font-size: 24rpx;
+ line-height: 24rpx;
+ font-weight: normal;
}
.listimage{
position: absolute;
right: 18rpx;
width: 20px;
- top: 40rpx;
+ top: 28rpx;
}
.index-scroll-view {
width: 100%;
white-space: nowrap;
}
-
.index-scroll-view .commodity {
- display: inline-block;
- margin: 16rpx 30rpx 16rpx;
- margin-right: 0;
- position: relative;
- background: #fff;
- /* border: 1rpx solid #dddee1; */
- width: 334rpx;
- /* 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: 329rpx;
- height: 200rpx;
- border-radius: 10rpx;
- border: 1px solid #ebeced;
+ width: 285rpx;
+ height: 166rpx;
+ background:rgba(255,255,255,1);
+ border-radius:16rpx;
}
.index-scroll-view .commodity-info {
@@ -60,13 +65,14 @@
}
.index-scroll-view .commodity-info-name {
- font-size: 24rpx;
- color: #000000;
- letter-spacing: 0.7rpx;
+ width: 285rpx;
+ overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
- overflow: hidden;
- width:167px;
+ font-size: 28rpx;
+ line-height: 30rpx;
+ margin-top: 16rpx;
+ color: #333333;
}
.index-scroll-view .commodity-info-time {
@@ -77,9 +83,13 @@
}
.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;
@@ -90,14 +100,21 @@
text-decoration:line-through;
line-height: 36rpx;
}
-.commodity-info-price{
- line-height: 36rpx;
-}
-.barginiconimg{
+.barginicon{
width: 24rpx;
height: 22rpx;
- margin-right: 2rpx;
+}
+.barginiconimg{
+ 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/user/index.wxml b/pages/user/index.wxml
index 6a0dcb5..27a1c92 100644
--- a/pages/user/index.wxml
+++ b/pages/user/index.wxml
@@ -1,7 +1,4 @@
-