diff --git a/assets/images/icon004.png b/assets/images/icon004.png
deleted file mode 100644
index 977130f..0000000
Binary files a/assets/images/icon004.png and /dev/null differ
diff --git a/pages/bargain/bargainDatail/bargainDatail.js b/pages/bargain/bargainDatail/bargainDatail.js
index 77d7fcb..566e26d 100644
--- a/pages/bargain/bargainDatail/bargainDatail.js
+++ b/pages/bargain/bargainDatail/bargainDatail.js
@@ -69,7 +69,7 @@ Page({
*/
getPressOrderStatus: function(orderId) {
let that = this;
- Http.post({
+ Http.get({
url: config.api.getPressOrderStatus,
data: {
orderId: orderId
diff --git a/pages/bargain/bargainDatail/bargainDatail.wxss b/pages/bargain/bargainDatail/bargainDatail.wxss
index b55b17a..bfa2f51 100644
--- a/pages/bargain/bargainDatail/bargainDatail.wxss
+++ b/pages/bargain/bargainDatail/bargainDatail.wxss
@@ -162,7 +162,6 @@
.text01{
width: 100rpx;
margin-right: 6rpx;
- overflow: hidden;
height: 76rpx;
line-height: 76rpx;
}
@@ -177,8 +176,6 @@
}
.text02{
display: inline-block;
- width: 220rpx;
- overflow: hidden;
}
.text03{
width: 240rpx;
@@ -186,6 +183,8 @@
font-size:24rpx;
height: 76rpx;
line-height: 76rpx;
+ white-space: nowrap;
+ text-overflow: ellipsis;
overflow: hidden;
}
.person{
@@ -194,11 +193,7 @@
padding-top: 31rpx;
}
.text02 text:nth-of-type(2){
- width: 80rpx;
- overflow: hidden;
color: #FF3535;
- white-space: nowrap;
- text-overflow: ellipsis;
text-align: left;
}
.people{
diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js
index b5aaf32..f561ea1 100644
--- a/pages/coupon/detail/index.js
+++ b/pages/coupon/detail/index.js
@@ -229,7 +229,6 @@ Page({
couponId: options.couponId,
title: that.data.data.title ? that.data.data.title : '',
});
-
if (options.cardType) {
that.setData({
cardType: options.cardType
diff --git a/pages/index/index.js b/pages/index/index.js
index 01a0dd6..b29ec3b 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -69,7 +69,7 @@ Page({
wx.redirectTo({
url: `/pages/getuserinfo/index?orderId=${orderId}&from='${"discount"}`
});
- }else{
+ } else {
wx.redirectTo({
url: `/pages/getuserinfo/index`
});
diff --git a/pages/passCar/passCar.js b/pages/passCar/passCar.js
index ee23c33..7d4adf6 100644
--- a/pages/passCar/passCar.js
+++ b/pages/passCar/passCar.js
@@ -487,10 +487,10 @@ Page({
})
.catch(err => {
console.log(err)
- wx.showToast({
- title: err.message,
- icon:"none"
- })
+ // wx.showToast({
+ // title: err.message,
+ // icon:"none"
+ // })
})
},
diff --git a/pages/user/index.wxml b/pages/user/index.wxml
index 7cf5950..743f6b3 100644
--- a/pages/user/index.wxml
+++ b/pages/user/index.wxml
@@ -76,7 +76,7 @@
- 版本号:3.4.1
+ 版本号:3.3.3