diff --git a/app.wxss b/app.wxss
index 99e15d2..31dc15f 100644
--- a/app.wxss
+++ b/app.wxss
@@ -17,6 +17,13 @@
-webkit-text-stroke-width: 0.2rpx;
-moz-osx-font-smoothing: grayscale;
}
+.clearfix:after {
+content: ".";
+display: block;
+height: 0;
+clear: both;
+visibility: hidden;
+}
/* 定位 */
.icon-dingweib:before {
content: "\e652";
diff --git a/assets/img/act.png b/assets/img/act.png
new file mode 100644
index 0000000..b42ba83
Binary files /dev/null and b/assets/img/act.png differ
diff --git a/assets/img/dingdan.png b/assets/img/dingdan.png
index ed5cab2..aceab06 100644
Binary files a/assets/img/dingdan.png and b/assets/img/dingdan.png differ
diff --git a/assets/img/shang.png b/assets/img/shang.png
new file mode 100644
index 0000000..0c4c2e9
Binary files /dev/null and b/assets/img/shang.png differ
diff --git a/components/banner/index.wxss b/components/banner/index.wxss
index 022334a..bca8cd6 100644
--- a/components/banner/index.wxss
+++ b/components/banner/index.wxss
@@ -6,8 +6,7 @@
margin:-126rpx auto 0;
border-radius:16rpx;
z-index: 10000;
- /* box-shadow: 0px 10rpx 10rpx 0px rgba(0, 0, 0, 0.2); */
- box-shadow: 0 5px 15px 0 rgba(0,0,0,.6);
+ box-shadow: 0 6px 20px 0 rgba(0,0,0,0.10);
}
.index-slide,
swiper-item
diff --git a/pages/actdetail/actdetail.wxss b/pages/actdetail/actdetail.wxss
index 89f88de..330b835 100644
--- a/pages/actdetail/actdetail.wxss
+++ b/pages/actdetail/actdetail.wxss
@@ -1,9 +1,12 @@
-view text{
+view text {
display: block;
}
-view text:nth-of-type(1){
+
+view text:nth-of-type(1) {
padding: 20rpx 30rpx;
- font-size: 28rpx;
- line-height: 50rpx;
- color: #999;
-}
\ No newline at end of file
+ font-size: 26rpx;
+ color: #191919;
+ letter-spacing: 0;
+ text-align: justify;
+ line-height: 46rpx;
+}
diff --git a/pages/bannerdetail/index.wxml b/pages/bannerdetail/index.wxml
index c8c1c82..f2b3ccd 100644
--- a/pages/bannerdetail/index.wxml
+++ b/pages/bannerdetail/index.wxml
@@ -27,7 +27,7 @@
-->
-
+
@@ -48,14 +48,12 @@
+
+
免费领
马上购
-
- 剩余{{item.remainInventory}}
-
-
diff --git a/pages/bannerdetail/index.wxss b/pages/bannerdetail/index.wxss
index 82d5bce..f99f482 100644
--- a/pages/bannerdetail/index.wxss
+++ b/pages/bannerdetail/index.wxss
@@ -61,7 +61,7 @@ page {
.proct {
position: relative;
height: 60rpx;
- margin-top:20rpx;
+ margin-top: 20rpx;
}
.proct text:nth-of-type(1) {
@@ -72,13 +72,14 @@ page {
display: inline-block;
width: 60rpx;
height: 64rpx;
- padding-right:20rpx;
- border-right: 2px solid #e5e5e5;
+ padding-right: 20rpx;
+ border-right: 2px solid #e5e5e5;
}
+
.proct text:nth-of-type(2) {
display: inline-block;
width: 498rpx;
- height: 60rpx;
+ height: 63rpx;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
@@ -171,12 +172,20 @@ page {
navigator {
display: block;
- padding: 0 24rpx 0;
margin-bottom: 24rpx;
+ width: 344rpx;
+}
+
+navigator:nth-of-type(2n) {
+ float: right;
+}
+
+navigator:nth-of-type(2n+1) {
+ float: left;
}
.contain {
- padding-top: 24rpx;
+ padding: 24rpx 25rpx 0;
}
.posi {
@@ -298,15 +307,15 @@ navigator {
.buy {
display: block;
- background: #00c0ff;
- height: 50rpx;
- width: 120rpx;
+ background: #ff4949;
+ border-radius: 30rpx;
+ height: 48rpx;
+ width: 112rpx;
margin: 0 auto;
color: #fff;
- font-size: 28rpx;
- line-height: 50rpx;
+ font-size: 26rpx;
+ line-height: 48rpx;
text-align: center;
- border-radius: 50rpx;
}
.coupons1-btn-gm {
@@ -324,14 +333,11 @@ navigator {
}
.coupons1 {
- flex-direction: row;
- display: flex;
- padding: 24rpx;
position: relative;
- height: 152rpx;
background: #fff;
border-radius: 16rpx;
- box-shadow: 0 5px 15px 0 rgba(0, 0, 0, 0.3);
+ padding-bottom: 21rpx;
+ overflow: hidden;
}
/* .coupons1-border {
@@ -344,10 +350,9 @@ navigator {
} */
.coupons1-img {
- width: 160rpx;
- height: 160rpx;
+ width: 344rpx;
+ height: 258rpx;
overflow: hidden;
- border-radius: 10rpx;
}
.coupons1-img image {
@@ -364,7 +369,6 @@ navigator {
font-size: 28rpx;
color: #000;
letter-spacing: 0;
- line-height: 38rpx;
}
.i {
@@ -377,12 +381,20 @@ navigator {
font-size: 36rpx;
color: #f96563;
line-height: 50rpx;
+ margin-top: 21rpx;
}
.tit {
- font-size: 28rpx;
+ font-size: 30rpx;
color: #000;
letter-spacing: 0;
+ line-height: 42rpx;
+ width: 270rpx;
+ height: 42rpx;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ padding-top: 16rpx;
}
.coupons1-info-price-o {
@@ -413,8 +425,8 @@ navigator {
.coupons1-btn {
position: absolute;
width: 120rpx;
- top: 61rpx;
- right: 30rpx;
+ bottom: 25rpx;
+ right: 13rpx;
}
.coupons1-btn-gm {
@@ -440,7 +452,7 @@ navigator {
text-overflow: ellipsis;
width: 300rpx;
height: 33rpx;
- color: #919191;
+ color: #999;
letter-spacing: 0;
}
@@ -450,7 +462,8 @@ navigator {
line-height: 34rpx;
display: inline-block;
}
-.jian{
+
+.jian {
width: 44rpx;
position: absolute;
bottom: 1.7%;
diff --git a/pages/coupon/detail/index.wxml b/pages/coupon/detail/index.wxml
index 30eb95e..fd4603e 100644
--- a/pages/coupon/detail/index.wxml
+++ b/pages/coupon/detail/index.wxml
@@ -6,16 +6,35 @@
- {{data.title}}限购{{data.useLimitQuantity}}件
- 剩余时间:{{endtime}}
- 剩余时间:即将到期
- 自领取之日起{{data.validDays}}天内有效
- 当次有效
- 剩余件数:{{data.remainInventory}}件
-
-
- ¥{{data.salePriceStr}}
- ¥{{data.priceStr}}
+ {{data.title}}
+ {{data.subTitle}}
+
+ 售价:
+ {{data.salePriceStr}}
+ 元
+ {{data.priceStr}}元
+
+ 剩余{{data.remainInventory}}件
+
+
+
+
+ 剩余时间:
+ {{endtime}}
+
+
+ 剩余时间:
+ 即将到期
+
+ 自领取之日起
+ {{data.validDays}}天内有效
+
+ 当次有效
+
+
+ 限购条件:
+ 每人{{data.useLimitQuantity}}张
+
@@ -30,11 +49,9 @@
-
+
+
购买须知
@@ -45,7 +62,7 @@
-
+
diff --git a/pages/coupon/detail/index.wxss b/pages/coupon/detail/index.wxss
index 56f2351..e817b15 100644
--- a/pages/coupon/detail/index.wxss
+++ b/pages/coupon/detail/index.wxss
@@ -1,16 +1,19 @@
@import "../../../app.wxss";
+page {
+ background: #fff;
+}
+
.coupons {
width: 100%;
- background: #f6f6f6;
position: relative;
overflow: hidden;
- padding-bottom: 120rpx;
+ padding-bottom: 170rpx;
}
.banner {
- width: 100%;
- height: 465rpx;
+ width: 750rpx;
+ height: 534.5rpx;
}
.banner image {
@@ -20,68 +23,120 @@
.coupons_info {
width: 92%;
- height: 186rpx;
- display: flex;
- justify-content: space-between;
padding: 0 4%;
background: #fff;
+ border-top-left-radius: 20rpx;
+ border-top-right-radius: 20rpx;
+ margin-top: -25rpx;
+ position: relative;
+ z-index: 100000000;
}
-.coupons_info view {
- display: flex;
- flex-direction: column;
+.title {
+ display: block;
+ font-size: 32rpx;
+ color: #000;
+ letter-spacing: 1.09rpx;
+ line-height: 45rpx;
+ width: 542rpx;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ padding-top: 30rpx;
}
-.coupons_info view:nth-child(1) text {
- font-size: 30rpx;
- margin-top: 6%;
+.subTitle {
+ display: block;
+ width: 588rpx;
+ height: 37rpx;
+ font-size: 26rpx;
+ color: #999;
+ letter-spacing: 1.16rpx;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ padding: 6rpx 0;
}
-.coupons_info view:nth-child(1) text:nth-child(1) text {
- color: #ff3434;
+.rest {
font-size: 24rpx;
- border: 1px solid #ff3434;
- border-radius: 6rpx;
- margin-left: 2%;
- padding: 0 5rpx;
+ color: #919191;
+ letter-spacing: 0;
+ height: 70rpx;
+ line-height: 70rpx;
+ /* border-bottom: 1px solid #eee; */
+ border-bottom: 1px solid #f9f9f9;
}
-.coupons_info view:nth-child(1) text:nth-child(2),
-.coupons_info view:nth-child(1) text:nth-child(3) {
- color: #b8b8b8;
+.restNum {
font-size: 24rpx;
- margin-top: 4%;
+ color: #999;
+ letter-spacing: 1.16rpx;
+ text-align: right;
}
-.coupons_info view:nth-child(1) text:nth-child(2) text,
-.coupons_info view:nth-child(1) text:nth-child(3) text {
- color: #ff3434;
+.time {
font-size: 24rpx;
+ color: #333;
+ letter-spacing: 0;
+ line-height: 33rpx;
+ display: inline-block;
}
-.coupons_info view:nth-child(2) text:nth-child(1) {
- font-size: 36rpx;
- color: #ff3434;
- margin-top: 40rpx;
- font-weight: bold;
+.txt01 {
+ font-size: 24rpx;
+ color: #919191;
+ letter-spacing: 0;
+}
+
+.price {
+ font-size: 24rpx;
+ color: #999;
+ letter-spacing: 0;
+}
+
+.salePriceStr {
+ font-size: 24rpx;
+ color: #999;
+ letter-spacing: 0;
+}
+
+.salePriceStr .pri01 {
+ font-size: 40rpx;
+ color: #ff4949;
+ letter-spacing: 0;
+ margin-left: 10rpx;
+}
+
+.salePriceStr .yuan {
+ font-size: 24rpx;
+ color: #ff4949;
+ letter-spacing: 0;
}
-.coupons_info view:nth-child(2) text:nth-child(2) {
+.price text {
font-size: 24rpx;
- color: #b4b4b4;
+ color: #333;
+ letter-spacing: 0;
+}
+
+.throgh {
text-decoration: line-through;
- padding-left: 10rpx;
- padding-top: 4rpx;
+ margin-left: 10rpx;
}
.posi {
position: relative;
width: 92%;
- display: flex;
- flex-direction: column;
- padding: 0 4%;
- background: #fff;
- margin-top: 2%;
+ margin: 0 auto;
+}
+
+.fl {
+ float: left;
+}
+
+.fr {
+ float: right;
}
.posi>view:nth-child(2) {
@@ -105,45 +160,48 @@
.posi_logo {
width: 100%;
- height: 156rpx;
display: flex;
- margin-top: 30rpx;
+ padding: 20rpx 0;
+ background: #fff;
+ height: 100rpx;
+ border-bottom: 1px solid #f9f9f9;
}
.posi_logo view:nth-child(1) {
- width: 126rpx;
- height: 126rpx;
- border-radius: 50%;
+ width: 100rpx;
+ height: 100rpx;
+ border-radius: 16rpx;
overflow: hidden;
- flex: 2;
}
.posi_logo view:nth-child(1) image {
- width: 100%;
- height: 100%;
+ display: block;
+ width: 100rpx;
+ height: 100rpx;
+ border-radius: 16rpx;
+ border: 2px solid #e5e5e5;
}
.posi_logo view:nth-child(2) {
display: flex;
flex-direction: column;
flex: 8;
- padding-top: 20rpx;
padding-left: 30rpx;
}
.posi_logo view:nth-child(2) text:nth-child(1) {
- font-size: 30rpx;
+ font-size: 32rpx;
+ color: #333;
+ letter-spacing: 0;
}
.posi_logo view:nth-child(2) text:nth-child(2) {
font-size: 24rpx;
color: #b8b8b8;
- padding-top: 10rpx;
- width:450rpx;
-}
-
-.notes {
- margin-top: 2%;
+ padding-top: 3rpx;
+ width: 450rpx;
+ height: 36rpx;
+ overflow: hidden;
}
.notes view:nth-child(1) {
@@ -152,59 +210,66 @@
padding: 0 4%;
line-height: 87rpx;
background: #fff;
- border-bottom: 1rpx solid #f5f5f5;
- border-top: 1rpx solid #f5f5f5;
+}
+
+.active {
+ opacity: 0.6;
}
.notes view:nth-child(1) text {
- font-size: 30rpx;
- font-weight: bold;
+ font-size: 24rpx;
+ color: #919191;
+ letter-spacing: 0;
}
.notes view:nth-child(2) {
width: 92%;
- padding: 2% 4%;
+ padding: 0 4%;
background: #fff;
- border-bottom: 1rpx solid #f5f5f5;
display: flex;
flex-direction: column;
}
.notes view:nth-child(2)>text {
- font-size: 26rpx;
- color: #a9a9a9;
- line-height: 45rpx;
+ font-size: 24rpx;
+ color: #333;
+ letter-spacing: 0;
+ line-height: 42rpx;
}
-
-
.buy-view {
background: #fff;
position: fixed;
- padding-top: 10rpx;
- height: 98rpx;
- bottom: 0rpx;
+ height: 96rpx;
+ bottom: 0;
left: 0;
right: 0;
+ padding-bottom: 22rpx;
+ padding-top: 22rpx;
}
.buy {
background: #00c0ff;
- height: 88rpx;
- width: 98%;
- margin: 0 auto;
+ height: 94rpx;
+ width: 670rpx;
+ margin: 0 auto 30rpx;
color: #fff;
font-size: 36rpx;
- line-height: 88rpx;
- border-radius: 6rpx;
+ line-height: 94rpx;
+ border-radius: 61rpx;
}
+
.tel {
position: absolute;
- right: 50rpx;
+ right: 0;
top: 0;
bottom: 0;
margin: auto;
width: 50rpx;
height: 50rpx;
- z-index:1000000;
+ z-index: 1000000;
+}
+
+.txt {
+ margin-right: 30rpx;
}
diff --git a/pages/couponorder/index/index.wxml b/pages/couponorder/index/index.wxml
index 8525e4d..e6350d5 100644
--- a/pages/couponorder/index/index.wxml
+++ b/pages/couponorder/index/index.wxml
@@ -6,7 +6,7 @@
- 暂无优惠券哦
+ 再忙,也要记得买点什么犒赏自己~
diff --git a/pages/order/index/index.wxml b/pages/order/index/index.wxml
index 708f4a3..02eb240 100644
--- a/pages/order/index/index.wxml
+++ b/pages/order/index/index.wxml
@@ -58,7 +58,8 @@
- 暂无订单
+ 您还没有相关订单
+ 再忙,也要记得买点什么犒赏自己~
diff --git a/pages/order/index/index.wxss b/pages/order/index/index.wxss
index 7cd147a..e3ad6d2 100644
--- a/pages/order/index/index.wxss
+++ b/pages/order/index/index.wxss
@@ -134,19 +134,27 @@
}
.dingdan {
- margin-top: 200rpx;
+ margin-top: 33rpx;
}
-.dingdan text {
+.dingdan text:nth-of-type(1) {
display: block;
+ font-size: 34rpx;
+ color: #333;
+ letter-spacing: 0;
text-align: center;
- font-size: 30rpx;
- color: #00c0ff;
}
-
+.dingdan text:nth-of-type(2) {
+ display: block;
+font-size: 28rpx;
+color: #999999;
+letter-spacing: 0;
+text-align: center;
+}
.dingdan image {
display: block;
- width: 100rpx;
+ width: 300rpx;
+ height: 300rpx;
margin: 0 auto 16rpx;
}
diff --git a/pages/user/index.wxml b/pages/user/index.wxml
index 79ef2b1..386b4eb 100644
--- a/pages/user/index.wxml
+++ b/pages/user/index.wxml
@@ -1,19 +1,24 @@
+
- 成长值:1000
+ 微信用户
+
+ 985
+ 成长值
+
我的订单
- 全部订单
+ 查看全部
diff --git a/pages/user/index.wxss b/pages/user/index.wxss
index 9f483f0..956dcb5 100644
--- a/pages/user/index.wxss
+++ b/pages/user/index.wxss
@@ -1,21 +1,27 @@
.margin {
- background: #f8f8f8;
- height: 20rpx;
+ /* background: #f8f8f8; *//* height: 20rpx; */
}
.user {
- background: #f8f8f8;
+ background: #fff;
min-height: 100vh;
}
.user-title {
- height: 186rpx;
- padding: 30rpx;
+ position: relative;
+ box-shadow: 0 6px 20px 0 rgba(0, 0, 0, 0.10);
+ border-radius: 8px;
+ height: 176rpx;
+ width: 698rpx;
+ padding: 0 30rpx;
display: flex;
flex-direction: row;
box-sizing: border-box;
background: #fff;
+ margin: -116rpx auto 0;
+ border-bottom: 6rpx solid #02c0ff;
}
+
/*
.user-avatar {
padding-right: 30rpx;
@@ -25,7 +31,8 @@
overflow: hidden;
border: 1px solid red;
} */
-.couponnum{
+
+.couponnum {
display: inline-block;
position: absolute;
top: 20rpx;
@@ -37,6 +44,7 @@
background: red;
font-size: 22rpx;
}
+
.user-avatar open-data {
display: block;
width: 100%;
@@ -45,20 +53,70 @@
.user-phone {
font-family: PingFangSC-Regular;
- font-size: 30rpx;
height: 120rpx;
- margin-left: 20rpx;
- color: #666;
+ margin-left: 149rpx;
letter-spacing: 0.64rpx;
line-height: 44rpx;
- margin-top: 16rpx;
+ margin-top: 43rpx;
+ font-size: 36rpx;
+ color: #000;
}
-.user-avatar{
- display: block;
+
+.user-avatar {
+ position: absolute;
+ left: 30rpx;
+ top: 0;
+ bottom: 0;
width: 120rpx;
height: 120rpx;
- border-radius:16rpx;
+ border-radius: 50%;
overflow: hidden;
+ margin: auto;
+}
+
+.chengzhang {
+ font-size: 28rpx;
+ color: #999;
+ line-height: 40rpx;
+}
+
+.chengzhang1 {
+ position: absolute;
+ right: 0;
+ bottom: 0;
+ top: 32rpx;
+}
+
+.chengzhang1 text {
+ display: block;
+}
+
+.chengzhang1 image {
+ width: 24rpx;
+ height: 24rpx;
+ vertical-align: top;
+ margin-top: 10rpx;
+}
+
+.chengzhang1 .view {
+ font-size: 48rpx;
+ color: #01bffe;
+ line-height: 67rpx;
+}
+
+.chengzhang1 text {
+ font-size: 24rpx;
+ color: #333;
+ line-height: 33rpx;
+}
+
+.bannerbg {
+ width: 100%;
+}
+
+.bannerbg image {
+ display: block;
+ width: 100%;
}
.open01 {
@@ -66,6 +124,7 @@
width: 120rpx;
height: 120rpx;
}
+
.user-btns {
background: #fff;
}
@@ -85,9 +144,10 @@
}
.user-btns .user-btn > view:last-child {
+ font-size: 28rpx;
+ color: #888;
+ letter-spacing: 1.16rpx;
text-align: right;
- color: #b8b8b8;
- font-size: 24rpx;
}
.user-btns .user-btn > view:last-child .iconfont {