From ae826bcf80076eca9637b76188707a56d3bef796 Mon Sep 17 00:00:00 2001
From: meo <18801474720@163.com>
Date: Tue, 25 Sep 2018 20:20:55 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9][?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9]:C=E7=AB=AF=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
=?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app.wxss | 2 +-
components/coupons/index.wxml | 16 ++++++++-----
components/coupons/index.wxss | 37 ++++++++++++++++++++---------
pages/coupon/detail/index.wxss | 6 ++---
pages/couponorder/detail/index.wxml | 2 +-
pages/couponorder/index/index.wxss | 25 ++++++++++++++-----
pages/index/index.wxml | 1 -
pages/index/index.wxss | 14 -----------
pages/index/rushToBuy/index.wxss | 6 ++---
pages/order/index/index.wxss | 4 ++++
pages/user/index.wxml | 7 ++++--
pages/user/index.wxss | 17 +++++++++++++
utils/HttpBasics.js | 12 ++++++----
13 files changed, 96 insertions(+), 53 deletions(-)
diff --git a/app.wxss b/app.wxss
index 31dc15f..0969497 100644
--- a/app.wxss
+++ b/app.wxss
@@ -103,7 +103,7 @@ visibility: hidden;
}
view,
text {
- font-family: PingFangSC-Semibold;
+ font-family: PingFangSC-Regular;
}
page {
width: 100%;
diff --git a/components/coupons/index.wxml b/components/coupons/index.wxml
index 3c9b4d1..0821b2a 100644
--- a/components/coupons/index.wxml
+++ b/components/coupons/index.wxml
@@ -8,12 +8,16 @@
{{data.title}}
{{data.subTitle}}
- {{data.salePriceStr}}元
-
- 满{{data.usePriceStr}}元可用
-
-
- 仅限本店使用
+
+ {{data.salePriceStr}}元
+
+ {{data.priceStr}}元
+ 满{{data.usePriceStr}}元可用
+
+
+ {{data.priceStr}}元
+ 仅限本店使用
+
{{data.merchantName}}
diff --git a/components/coupons/index.wxss b/components/coupons/index.wxss
index 5025349..d257a41 100644
--- a/components/coupons/index.wxss
+++ b/components/coupons/index.wxss
@@ -53,12 +53,13 @@
}
.coupons-info-price-p {
- display: inline-block;
- font-size: 40rpx;
+ display: block;
+ font-size: 50rpx;
color: #FF4949;
- line-height: 56rpx;
}
-
+.price{
+ line-height: 36rpx;
+}
.tit {
overflow: hidden;
white-space: nowrap;
@@ -118,7 +119,7 @@
.coupons-btn-gms {
background: #999 !important;
- border-radius: 10rpx !important;
+ border-radius: 60rpx !important;
opacity: 0.6;
margin: 0 !important;
padding: 0 !important;
@@ -134,18 +135,19 @@
.subtitle {
font-size: 24rpx;
color: #919191;
- text-align: left;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
width: 300rpx;
height: 33rpx;
line-height: 33rpx;
+ font-weight:lighter;
+ margin-bottom: 18rpx;
}
.coupons-info-manjian {
font-weight: normal;
- font-size: 24rpx;
+ font-size: 20rpx;
line-height: 34rpx;
display: inline-block;
color: #FF4949;
@@ -154,17 +156,30 @@
.coupons-info-manjian1 {
font-weight: normal;
- line-height: 28rpx;
font-size: 20rpx;
+ line-height: 22rpx;
color: #919191;
letter-spacing: 0;
- display: inline-block;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
width: 300rpx;
+ margin-top: 16rpx;
+}
+.coupons-info-manjian text{
+ display: block;
+ line-height: 20rpx;
+}
+.coupons-info-manjian text:nth-of-type(1){
+ display: block;
+ text-decoration:line-through;
+ color: #FF4949;
+ opacity: .6;
+}
+.coupons-info-manjian text:nth-of-type(2){
+ display: block;
+ color: #ccc;
}
-
/**上拉加载更多**/
.userinfo {
@@ -186,7 +201,7 @@
.sy {
display: block;
- text-align: center;
+ text-align: right;
width: 181rpx;
font-size: 24rpx;
color: #999;
diff --git a/pages/coupon/detail/index.wxss b/pages/coupon/detail/index.wxss
index c3af6b5..4ccfe60 100644
--- a/pages/coupon/detail/index.wxss
+++ b/pages/coupon/detail/index.wxss
@@ -178,7 +178,7 @@ page {
width: 100rpx;
height: 100rpx;
border-radius: 16rpx;
- border: 2px solid #e5e5e5;
+ border: 1px solid #e5e5e5;
}
.posi_logo view:nth-child(2) {
@@ -217,7 +217,7 @@ page {
.notes view:nth-child(1) text {
font-size: 24rpx;
- color: #919191;
+ color: #333;
letter-spacing: 0;
}
@@ -231,7 +231,7 @@ page {
.notes view:nth-child(2)>text {
font-size: 24rpx;
- color: #333;
+ color: #919191;
letter-spacing: 0;
line-height: 42rpx;
}
diff --git a/pages/couponorder/detail/index.wxml b/pages/couponorder/detail/index.wxml
index bbe892c..8fc1286 100644
--- a/pages/couponorder/detail/index.wxml
+++ b/pages/couponorder/detail/index.wxml
@@ -1,7 +1,7 @@
-
+
{{data.title}}
diff --git a/pages/couponorder/index/index.wxss b/pages/couponorder/index/index.wxss
index c495914..91a8908 100644
--- a/pages/couponorder/index/index.wxss
+++ b/pages/couponorder/index/index.wxss
@@ -37,7 +37,7 @@
.detail_msg {
display: flex;
- padding-bottom: 30rpx;
+ padding-bottom: 26rpx;
}
.expiretime {
@@ -46,7 +46,7 @@
text-align: left;
text-indent: 1em;
height: 40rpx;
- line-height: 40rpx;
+ line-height: 36rpx;
font-size: 22rpx;
color: #333;
letter-spacing: 0;
@@ -85,16 +85,27 @@
.info view:nth-child(1) text {
font-size: 32rpx;
line-height: 32rpx;
+ height: 32rpx;
color: #333;
letter-spacing: 0;
+ width: 400rpx;
+ display: inline-block;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
}
.info view:nth-child(2) {
- padding-left: 4%;
+ padding-left: 2%;
font-size: 22rpx;
color: #333;
letter-spacing: 0;
margin-top: 6rpx;
+ display: inline-block;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ width: 400rpx;
}
.info view:nth-child(3) {
@@ -114,10 +125,12 @@
color: #02c0ff;
font-size: 28rpx;
}
-.active{
- color:#fff;
- background: #02c0ff;
+
+.active {
+ color: #fff;
+ background: #02c0ff;
}
+
.txt1 {
font-size: 22rpx;
color: #333;
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 248c8b2..9de6e1a 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -7,5 +7,4 @@
独家福利,抢完即止
-
\ No newline at end of file
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 5bb5c66..f6b3a0e 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -63,17 +63,3 @@ page {
bottom: 0;
z-index: 10;
}
-.gzh{
- display: none;
- position: absolute;
- bottom: 6%;
- width: 90%;
- left: 0;
- right: 0;
- margin: auto;
- z-index: 1000000;
- background: #ccc;
- border-radius: 16rpx;
- overflow: hidden;
- box-shadow:0 6px 20px 0 rgba(0,0,0,0.15);
-}
\ No newline at end of file
diff --git a/pages/index/rushToBuy/index.wxss b/pages/index/rushToBuy/index.wxss
index 9aa697b..033de98 100644
--- a/pages/index/rushToBuy/index.wxss
+++ b/pages/index/rushToBuy/index.wxss
@@ -32,14 +32,14 @@
.index-scroll-view .commodity {
display: inline-block;
- margin: 16rpx 30rpx 0;
+ margin: 16rpx 30rpx 16rpx;
margin-right: 0;
- overflow: hidden;
+ /* overflow: hidden; */
position: relative;
background: #fff;
/* border: 1rpx solid #dddee1; */
width: 355rpx;
- box-shadow: 0 0 10px 0 rgba(211,211,211,0.50);
+ box-shadow: 0 0 10px 0 rgba(211,211,211,0.30);
border-radius: 10rpx;
}
.index-scroll-view .commodity:last-child{
diff --git a/pages/order/index/index.wxss b/pages/order/index/index.wxss
index 91cf568..3446351 100644
--- a/pages/order/index/index.wxss
+++ b/pages/order/index/index.wxss
@@ -60,6 +60,10 @@
letter-spacing: 0;
line-height: 33rpx;
padding-left: 4%;
+ height: 66rpx;
+ overflow: hidden;
+ white-space: wrap;
+text-overflow: ellipsis;
}
.info view:nth-child(1) text {
diff --git a/pages/user/index.wxml b/pages/user/index.wxml
index d0fec30..4d0f6ac 100644
--- a/pages/user/index.wxml
+++ b/pages/user/index.wxml
@@ -66,8 +66,11 @@
-
- 版本号:2.0.7
+
+ 版本号:2.0.8
+
+
+
\ No newline at end of file
diff --git a/pages/user/index.wxss b/pages/user/index.wxss
index ad0963e..db12ac1 100644
--- a/pages/user/index.wxss
+++ b/pages/user/index.wxss
@@ -206,3 +206,20 @@
.user-out-btn::after {
opacity: 0;
}
+.gzh{
+ display: none;
+ position: absolute;
+ bottom: 6%;
+ width: 90%;
+ left: 0;
+ right: 0;
+ margin: auto;
+ z-index: 1000000;
+ background: #ccc;
+ border-radius: 16rpx;
+ overflow: hidden;
+ box-shadow:0 6px 20px 0 rgba(0,0,0,0.15);
+}
+.of{
+ display: block;
+}
diff --git a/utils/HttpBasics.js b/utils/HttpBasics.js
index 611de11..99d9593 100644
--- a/utils/HttpBasics.js
+++ b/utils/HttpBasics.js
@@ -90,6 +90,7 @@ class HttpBasics {
* @param {*} reject
*/
responseMap = (res, resolve, reject) => {
+ console.log(res);
// 网络状态码200
if (res.statusCode == 200) {
// 服务器code 200 成功
@@ -97,13 +98,14 @@ class HttpBasics {
resolve(res.data);
} else {
wx.hideLoading();
- // wx.showToast({
- // title: res.data.message
- // });
+ wx.showToast({
+ title: res.data.message
+ });
reject(res.data);
}
- } else {
- console.error("请求出错:", res);
+ }
+ else {
+ console.log("请求出错:", res);
reject(res.data);
}
};