| @@ -17,7 +17,7 @@ | |||||
| <text>{{item.merchantName}}</text> | <text>{{item.merchantName}}</text> | ||||
| <text>{{item.addr}}{{item.buildingName}}{{item.floorName}}</text> | <text>{{item.addr}}{{item.buildingName}}{{item.floorName}}</text> | ||||
| </view> | </view> | ||||
| <image bindtap='phone' data-merchantLinkPhone='{{item.merchantLinkPhone}}' class="tel" src="{{teljpgUrl}}" mode="widthFix" /> | |||||
| <image bindtap='phone' data-merchantLinkPhone='{{item.linkLinePhone?item.linkLinePhone:item.merchantLinkPhone}}' class="tel" src="{{teljpgUrl}}" mode="widthFix" /> | |||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| <view class='bottom' bindtap='more' wx:if="{{showMore}}">{{more}}</view> | <view class='bottom' bindtap='more' wx:if="{{showMore}}">{{more}}</view> | ||||
| @@ -1,5 +1,4 @@ | |||||
| <view wx:if="{{showPage}}"> | <view wx:if="{{showPage}}"> | ||||
| <!-- 券的详情页面 --> | |||||
| <view class='coupons'> | <view class='coupons'> | ||||
| <view class="coupons-body"> | <view class="coupons-body"> | ||||
| <view class='banner'> | <view class='banner'> | ||||
| @@ -823,14 +823,8 @@ Page({ | |||||
| wx.showLoading({ | wx.showLoading({ | ||||
| title: '订单正在处理中...', | title: '订单正在处理中...', | ||||
| }) | }) | ||||
| setTimeout(function() { | |||||
| wx.hideLoading() | |||||
| }, 5000) | |||||
| that.payOrderUpdate(that.data.orderId, payOrderId, 1, '', '', that); | that.payOrderUpdate(that.data.orderId, payOrderId, 1, '', '', that); | ||||
| if (res.errMsg == "requestPayment:ok") { | if (res.errMsg == "requestPayment:ok") { | ||||
| setTimeout(function() { | |||||
| wx.hideLoading(); | |||||
| }, 2000); | |||||
| /** | /** | ||||
| * 用户支付成功以后跳转到券包列表 | * 用户支付成功以后跳转到券包列表 | ||||
| */ | */ | ||||
| @@ -100,7 +100,7 @@ | |||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| <image bindtap='phone' data-merchantLinkPhone='{{item.merchantLinkPhone}}' class="tel" src="{{teljpgUrl}}" mode="widthFix" /> | |||||
| <image bindtap='phone' data-merchantLinkPhone='{{item.linkLinePhone?item.linkLinePhone:item.merchantLinkPhone}}' class="tel" src="{{teljpgUrl}}" mode="widthFix" /> | |||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| <view class='bottom' bindtap='more' wx:if="{{showMore}}">{{more}}</view> | <view class='bottom' bindtap='more' wx:if="{{showMore}}">{{more}}</view> | ||||
| @@ -61,7 +61,7 @@ | |||||
| <text>{{item.merchantName}}</text> | <text>{{item.merchantName}}</text> | ||||
| <text>{{item.addr}}{{item.buildingName}}{{item.floorName}}</text> | <text>{{item.addr}}{{item.buildingName}}{{item.floorName}}</text> | ||||
| </view> | </view> | ||||
| <view bindtap='phone' data-merchantLinkPhone='{{item.merchantLinkPhone}}'> | |||||
| <view bindtap='phone' data-merchantLinkPhone='{{item.linkLinePhone?item.linkLinePhone:item.merchantLinkPhone}}'> | |||||
| <image class="tel" src="{{teljpgUrl}}" mode="widthFix" /> | <image class="tel" src="{{teljpgUrl}}" mode="widthFix" /> | ||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| @@ -31,7 +31,7 @@ | |||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| <image bindtap='phone' data-merchantLinkPhone='{{item.merchantLinkPhone}}' class="tel" src="{{teljpgUrl}}" mode="widthFix" /> | |||||
| <image bindtap='phone' data-merchantLinkPhone='{{item.linkLinePhone?item.linkLinePhone:item.merchantLinkPhone}}' class="tel" src="{{teljpgUrl}}" mode="widthFix" /> | |||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| <view class='position' wx:if="{{merchantVoList.length==0}}"> | <view class='position' wx:if="{{merchantVoList.length==0}}"> | ||||
| @@ -40,7 +40,7 @@ | |||||
| <text>{{item.merchantName}}</text> | <text>{{item.merchantName}}</text> | ||||
| <text>{{item.addr}}{{item.buildingName}}{{item.floorName}}</text> | <text>{{item.addr}}{{item.buildingName}}{{item.floorName}}</text> | ||||
| </view> | </view> | ||||
| <image bindtap='phone' data-merchantLinkPhone='{{item.merchantLinkPhone}}' class="tel" src="{{teljpgUrl}}" mode="widthFix" /> | |||||
| <image bindtap='phone' data-merchantLinkPhone='{{item.linkLinePhone?item.linkLinePhone:item.merchantLinkPhone}}' class="tel" src="{{teljpgUrl}}" mode="widthFix" /> | |||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| @@ -67,7 +67,7 @@ | |||||
| <text>适用门店:</text> | <text>适用门店:</text> | ||||
| </view> | </view> | ||||
| <view wx:if="{{order.merchantVoList.length>=1}}" wx:for="{{order.merchantVoList}}" wx:key="{{index}}"> | <view wx:if="{{order.merchantVoList.length>=1}}" wx:for="{{order.merchantVoList}}" wx:key="{{index}}"> | ||||
| <view class='merchantVoList' bindtap='phone' data-merchantlinkphone='{{item.merchantLinkPhone}}'><image class='merchantImgUrl' src='{{item.merchantImgUrl}}' mode='widthFix'></image><text class='merchantName'>{{item.merchantName}} {{item.buildingName}}{{item.floorName}}</text><image class="tel" src="{{teljpgUrl}}" mode="widthFix"></image></view> | |||||
| <view class='merchantVoList' bindtap='phone' data-merchantlinkphone='{{item.linkLinePhone?item.linkLinePhone:item.merchantLinkPhone}}'><image class='merchantImgUrl' src='{{item.merchantImgUrl}}' mode='widthFix'></image><text class='merchantName'>{{item.merchantName}} {{item.buildingName}}{{item.floorName}}</text><image class="tel" src="{{teljpgUrl}}" mode="widthFix"></image></view> | |||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| <!-- 待付款 显示立即购买的按钮 --> | <!-- 待付款 显示立即购买的按钮 --> | ||||
| @@ -24,7 +24,7 @@ | |||||
| {{list.buildingName}}{{list.floorName}} | {{list.buildingName}}{{list.floorName}} | ||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| <view class='fr' bindtap='phone' data-merchantLinkPhone='{{item.merchantLinkPhone}}'> | |||||
| <view class='fr' bindtap='phone' data-merchantLinkPhone='{{item.linkLinePhone?item.linkLinePhone:item.merchantLinkPhone}}'> | |||||
| <image class="fr" src='{{teliconUrl}}' mode='widthFix'></image> | <image class="fr" src='{{teliconUrl}}' mode='widthFix'></image> | ||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| @@ -53,7 +53,7 @@ | |||||
| <text>{{item.merchantName}}</text> | <text>{{item.merchantName}}</text> | ||||
| <text>{{item.addr}}{{item.buildingName}}{{item.floorName}}</text> | <text>{{item.addr}}{{item.buildingName}}{{item.floorName}}</text> | ||||
| </view> | </view> | ||||
| <image bindtap='phone' data-merchantLinkPhone='{{item.merchantLinkPhone}}' class="tel" src="{{teljpgUrl}}" mode="widthFix" /> | |||||
| <image bindtap='phone' data-merchantLinkPhone='{{item.linkLinePhone?item.linkLinePhone:item.merchantLinkPhone}}' class="tel" src="{{teljpgUrl}}" mode="widthFix" /> | |||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| <view class='notes'> | <view class='notes'> | ||||
| @@ -77,7 +77,6 @@ button::after{ border: none; } | |||||
| width: 100%; | width: 100%; | ||||
| height: auto; | height: auto; | ||||
| padding-top: 6rpx; | padding-top: 6rpx; | ||||
| border-top: 2rpx solid rgb(240, 238, 238); | |||||
| } | } | ||||
| .des-peoplenum{ | .des-peoplenum{ | ||||
| display: inline; | display: inline; | ||||