@@ -69,7 +69,7 @@ Page({ | |||||
*/ | */ | ||||
getPressOrderStatus: function(orderId) { | getPressOrderStatus: function(orderId) { | ||||
let that = this; | let that = this; | ||||
Http.post({ | |||||
Http.get({ | |||||
url: config.api.getPressOrderStatus, | url: config.api.getPressOrderStatus, | ||||
data: { | data: { | ||||
orderId: orderId | orderId: orderId | ||||
@@ -162,7 +162,6 @@ | |||||
.text01{ | .text01{ | ||||
width: 100rpx; | width: 100rpx; | ||||
margin-right: 6rpx; | margin-right: 6rpx; | ||||
overflow: hidden; | |||||
height: 76rpx; | height: 76rpx; | ||||
line-height: 76rpx; | line-height: 76rpx; | ||||
} | } | ||||
@@ -177,8 +176,6 @@ | |||||
} | } | ||||
.text02{ | .text02{ | ||||
display: inline-block; | display: inline-block; | ||||
width: 220rpx; | |||||
overflow: hidden; | |||||
} | } | ||||
.text03{ | .text03{ | ||||
width: 240rpx; | width: 240rpx; | ||||
@@ -186,6 +183,8 @@ | |||||
font-size:24rpx; | font-size:24rpx; | ||||
height: 76rpx; | height: 76rpx; | ||||
line-height: 76rpx; | line-height: 76rpx; | ||||
white-space: nowrap; | |||||
text-overflow: ellipsis; | |||||
overflow: hidden; | overflow: hidden; | ||||
} | } | ||||
.person{ | .person{ | ||||
@@ -194,11 +193,7 @@ | |||||
padding-top: 31rpx; | padding-top: 31rpx; | ||||
} | } | ||||
.text02 text:nth-of-type(2){ | .text02 text:nth-of-type(2){ | ||||
width: 80rpx; | |||||
overflow: hidden; | |||||
color: #FF3535; | color: #FF3535; | ||||
white-space: nowrap; | |||||
text-overflow: ellipsis; | |||||
text-align: left; | text-align: left; | ||||
} | } | ||||
.people{ | .people{ | ||||
@@ -229,7 +229,6 @@ Page({ | |||||
couponId: options.couponId, | couponId: options.couponId, | ||||
title: that.data.data.title ? that.data.data.title : '', | title: that.data.data.title ? that.data.data.title : '', | ||||
}); | }); | ||||
if (options.cardType) { | if (options.cardType) { | ||||
that.setData({ | that.setData({ | ||||
cardType: options.cardType | cardType: options.cardType | ||||
@@ -69,7 +69,7 @@ Page({ | |||||
wx.redirectTo({ | wx.redirectTo({ | ||||
url: `/pages/getuserinfo/index?orderId=${orderId}&from='${"discount"}` | url: `/pages/getuserinfo/index?orderId=${orderId}&from='${"discount"}` | ||||
}); | }); | ||||
}else{ | |||||
} else { | |||||
wx.redirectTo({ | wx.redirectTo({ | ||||
url: `/pages/getuserinfo/index` | url: `/pages/getuserinfo/index` | ||||
}); | }); | ||||
@@ -487,10 +487,10 @@ Page({ | |||||
}) | }) | ||||
.catch(err => { | .catch(err => { | ||||
console.log(err) | console.log(err) | ||||
wx.showToast({ | |||||
title: err.message, | |||||
icon:"none" | |||||
}) | |||||
// wx.showToast({ | |||||
// title: err.message, | |||||
// icon:"none" | |||||
// }) | |||||
}) | }) | ||||
}, | }, | ||||
@@ -76,7 +76,7 @@ | |||||
<view class="margin"></view> | <view class="margin"></view> | ||||
<!-- <button bindtap="navigateTo" class="user-out-btn">退出登陆</button> --> | <!-- <button bindtap="navigateTo" class="user-out-btn">退出登陆</button> --> | ||||
<view bindlongtap='showVersion' class='version'> | <view bindlongtap='showVersion' class='version'> | ||||
<view wx:if="{{flag=='show'}}">版本号:3.4.1</view> | |||||
<view wx:if="{{flag=='show'}}">版本号:3.3.3</view> | |||||
<view wx:if="{{flag=='hidden'}}"></view> | <view wx:if="{{flag=='hidden'}}"></view> | ||||
</view> | </view> | ||||
</view> | </view> | ||||