diff --git a/assets/img/orbg.png b/assets/img/orbg.png
new file mode 100644
index 0000000..f0a7883
Binary files /dev/null and b/assets/img/orbg.png differ
diff --git a/pages/actdetail/actdetail.wxml b/pages/actdetail/actdetail.wxml
index 4a0b3bb..1499319 100644
--- a/pages/actdetail/actdetail.wxml
+++ b/pages/actdetail/actdetail.wxml
@@ -1,4 +1,3 @@
- 活动详情
{{detail}}
\ No newline at end of file
diff --git a/pages/actdetail/actdetail.wxss b/pages/actdetail/actdetail.wxss
index 6d8ed15..89f88de 100644
--- a/pages/actdetail/actdetail.wxss
+++ b/pages/actdetail/actdetail.wxss
@@ -2,13 +2,7 @@ view text{
display: block;
}
view text:nth-of-type(1){
- font-size: 30rpx;
- color: #000;
- padding: 30rpx 0;
- text-align: center;
-}
-view text:nth-of-type(2){
- padding: 0 30rpx;
+ padding: 20rpx 30rpx;
font-size: 28rpx;
line-height: 50rpx;
color: #999;
diff --git a/pages/bannerdetail/index.wxml b/pages/bannerdetail/index.wxml
index 5cb919c..c8c1c82 100644
--- a/pages/bannerdetail/index.wxml
+++ b/pages/bannerdetail/index.wxml
@@ -3,26 +3,17 @@
- 活动详情
-
-
-
+
活动详情
diff --git a/pages/bannerdetail/index.wxss b/pages/bannerdetail/index.wxss
index 569f5e3..82d5bce 100644
--- a/pages/bannerdetail/index.wxss
+++ b/pages/bannerdetail/index.wxss
@@ -1,12 +1,11 @@
@import "../../app.wxss";
page {
- background: #f5f5f5;
+ background: #fe5252;
}
.coupons {
width: 100%;
- background: #fff;
position: relative;
}
@@ -27,6 +26,73 @@ page {
display: block;
}
+.act {
+ position: relative;
+ z-index: 1000000000;
+ background: #fff;
+ border-radius: 12rpx;
+ width: 702rpx;
+ height: 212rpx;
+ margin: -46rpx auto 0;
+}
+
+.act text {
+ display: block;
+ padding-left: 4.8%;
+}
+
+.txt001 {
+ font-size: 34rpx;
+ color: #363636;
+ letter-spacing: 0;
+ text-align: left;
+ line-height: 48rpx;
+ padding-top: 3.2%;
+}
+
+.txt002 {
+ font-size: 24rpx;
+ color: #999;
+ letter-spacing: 0;
+ text-align: left;
+ line-height: 33rpx;
+}
+
+.proct {
+ position: relative;
+ height: 60rpx;
+ margin-top:20rpx;
+}
+
+.proct text:nth-of-type(1) {
+ font-size: 30rpx;
+ color: #ff4949;
+ letter-spacing: 0;
+ line-height: 32rpx;
+ display: inline-block;
+ width: 60rpx;
+ height: 64rpx;
+ padding-right:20rpx;
+ border-right: 2px solid #e5e5e5;
+}
+.proct text:nth-of-type(2) {
+ display: inline-block;
+ width: 498rpx;
+ height: 60rpx;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ font-size: 22rpx;
+ color: #6f6f6f;
+ letter-spacing: 0;
+}
+
+.orbg {
+ position: absolute;
+ top: 256rpx;
+ z-index: 1000000;
+}
+
.banner text {
position: absolute;
right: 0;
@@ -39,11 +105,11 @@ page {
opacity: 0.8;
background: #000;
font-size: 24rpx;
-color: #FFFFFF;
-letter-spacing: 0;
-text-indent: .5em;
-border-top-left-radius: 50rpx;
-border-bottom-left-radius: 50rpx;
+ color: #fff;
+ letter-spacing: 0;
+ text-indent: 0.5em;
+ border-top-left-radius: 50rpx;
+ border-bottom-left-radius: 50rpx;
}
.coupons_info {
@@ -110,7 +176,6 @@ navigator {
}
.contain {
- background: #f5f5f5;
padding-top: 24rpx;
}
@@ -385,6 +450,12 @@ navigator {
line-height: 34rpx;
display: inline-block;
}
+.jian{
+ width: 44rpx;
+ position: absolute;
+ bottom: 1.7%;
+ right: 3.5%;
+}
/**上拉加载更多**/
diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js
index 20e67a5..769eaec 100644
--- a/pages/coupon/detail/index.js
+++ b/pages/coupon/detail/index.js
@@ -350,12 +350,12 @@ Page({
fail: res => {
that.payOrderUpdate(that.data.orderId, payOrderId, 2); // 支付失败
console.log(res);
- wx.showToast({
- title: "支付失败",
- image: "./../../../assets/img/fail.png",
- duration: 2000,
- mask: false
- });
+ // wx.showToast({
+ // title: "支付失败",
+ // image: "./../../../assets/img/fail.png",
+ // duration: 2000,
+ // mask: false
+ // });
return;
},
complete: res => {
diff --git a/pages/order/detail/index.js b/pages/order/detail/index.js
index 0718c9e..ffc4ba9 100644
--- a/pages/order/detail/index.js
+++ b/pages/order/detail/index.js
@@ -147,12 +147,12 @@ Page({
fail: res => {
that.payOrderUpdate(that.data.orderId, payOrderId, 2);
console.log(res);
- wx.showToast({
- title: "支付失败",
- image: "./../../../assets/img/fail.png",
- duration: 2000,
- mask: false
- });
+ // wx.showToast({
+ // title: "支付失败",
+ // image: "./../../../assets/img/fail.png",
+ // duration: 2000,
+ // mask: false
+ // });
return;
},
// complete: res => {