Browse Source

[浙江版 merge][修改]:[浙江版本merge到dev]

tags/富茂链客3.3.4
meo 6 years ago
parent
commit
6616849a4c
7 changed files with 9 additions and 15 deletions
  1. BIN
      assets/images/icon004.png
  2. +1
    -1
      pages/bargain/bargainDatail/bargainDatail.js
  3. +2
    -7
      pages/bargain/bargainDatail/bargainDatail.wxss
  4. +0
    -1
      pages/coupon/detail/index.js
  5. +1
    -1
      pages/index/index.js
  6. +4
    -4
      pages/passCar/passCar.js
  7. +1
    -1
      pages/user/index.wxml

BIN
assets/images/icon004.png View File

Before After
Width: 160  |  Height: 160  |  Size: 13 KiB

+ 1
- 1
pages/bargain/bargainDatail/bargainDatail.js View File

@@ -69,7 +69,7 @@ Page({
*/
getPressOrderStatus: function(orderId) {
let that = this;
Http.post({
Http.get({
url: config.api.getPressOrderStatus,
data: {
orderId: orderId


+ 2
- 7
pages/bargain/bargainDatail/bargainDatail.wxss View File

@@ -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{


+ 0
- 1
pages/coupon/detail/index.js View File

@@ -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


+ 1
- 1
pages/index/index.js View File

@@ -69,7 +69,7 @@ Page({
wx.redirectTo({
url: `/pages/getuserinfo/index?orderId=${orderId}&from='${"discount"}`
});
}else{
} else {
wx.redirectTo({
url: `/pages/getuserinfo/index`
});


+ 4
- 4
pages/passCar/passCar.js View File

@@ -487,10 +487,10 @@ Page({
})
.catch(err => {
console.log(err)
wx.showToast({
title: err.message,
icon:"none"
})
// wx.showToast({
// title: err.message,
// icon:"none"
// })
})
},


+ 1
- 1
pages/user/index.wxml View File

@@ -76,7 +76,7 @@
<view class="margin"></view>
<!-- <button bindtap="navigateTo" class="user-out-btn">退出登陆</button> -->
<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>
</view>


Loading…
Cancel
Save