Commit 23fc440d8251e27fe7c45baeef478fd53d81a200

Authored by vking
1 parent d07b6ac5

pay

@@ -109,7 +109,7 @@ Page({ @@ -109,7 +109,7 @@ Page({
109 }, 109 },
110 setInvoice(e){ 110 setInvoice(e){
111 let invoice={ 111 let invoice={
112 - orderid:this.data.checkout.id, 112 + rid:this.options.rid,
113 } 113 }
114 Object.keys(e.detail).forEach(key=>{ 114 Object.keys(e.detail).forEach(key=>{
115 invoice[key.toLowerCase()]=e.detail[key] 115 invoice[key.toLowerCase()]=e.detail[key]
@@ -129,7 +129,7 @@ Page({ @@ -129,7 +129,7 @@ Page({
129 GetOrderInfoInterval:null, 129 GetOrderInfoInterval:null,
130 GetOrderInfoRun(){ 130 GetOrderInfoRun(){
131 if(!this.GetOrderInfoInterval){ 131 if(!this.GetOrderInfoInterval){
132 - setInterval(()=>{ 132 + this.GetOrderInfoInterval=setInterval(()=>{
133 this.GetCheckout() 133 this.GetCheckout()
134 },8000) 134 },8000)
135 } 135 }
@@ -173,6 +173,32 @@ @@ -173,6 +173,32 @@
173 </navigator> 173 </navigator>
174 </view> 174 </view>
175 </view> 175 </view>
  176 + <block wx:if="{{checkout.price>0}}">
  177 + <view class="hr" style="margin-top: 78rpx;margin-bottom: 78rpx;"></view>
  178 + <view class="detail-info Medium" style="margin-top: 56rpx;">
  179 + <view class="flex-lr">
  180 + <view>实付金额</view>
  181 + <view class="detail-info-right" style="color:rgba(224,32,32,1);">¥{{checkout.price}}</view>
  182 + </view>
  183 + <view class="flex-lr" style="margin-top: 26rpx;">
  184 + <view></view>
  185 + <view class="detail-info-right see-pics">查看消费详情</view>
  186 + </view>
  187 + </view>
  188 + </block>
  189 + <block wx:if="{{checkout.invoice}}">
  190 + <view class="hr" style="margin-top: 78rpx;margin-bottom: 78rpx;"></view>
  191 + <view class="detail-info Medium" style="margin-top: 56rpx;">
  192 + <view class="flex-lr">
  193 + <view>发票</view>
  194 + <view class="detail-info-right">{{checkout.invoice.title}}</view>
  195 + </view>
  196 + <view class="flex-lr" style="margin-top: 26rpx;">
  197 + <view></view>
  198 + <view class="detail-info-right">{{checkout.invoice.taxnumber}}</view>
  199 + </view>
  200 + </view>
  201 + </block>
176 <block wx:if="{{rsl.length>0}}"> 202 <block wx:if="{{rsl.length>0}}">
177 <view class="line-push">为你推荐</view> 203 <view class="line-push">为你推荐</view>
178 <view class="transverse-list"> 204 <view class="transverse-list">
@@ -188,4 +188,12 @@ @@ -188,4 +188,12 @@
188 } 188 }
189 .checkout-icon-3{ 189 .checkout-icon-3{
190 background-image: url("http://nosqn.colorcun.com/checkout/images/1.png"); 190 background-image: url("http://nosqn.colorcun.com/checkout/images/1.png");
  191 +}
  192 +.see-pics{
  193 + height:42rpx;
  194 + font-size:30rpx;
  195 + font-weight:500;
  196 + color:rgba(53,53,53,1);
  197 + line-height:42rpx;
  198 + border-bottom: 2rpx solid #353535;
191 } 199 }
@@ -483,7 +483,7 @@ @@ -483,7 +483,7 @@
483 "id": 57, 483 "id": 57,
484 "name": "pages/customer/detail_owner", 484 "name": "pages/customer/detail_owner",
485 "pathName": "pages/customer/detail_owner", 485 "pathName": "pages/customer/detail_owner",
486 - "query": "id=60472&firstShowMsg=", 486 + "query": "id=61685",
487 "scene": null 487 "scene": null
488 }, 488 },
489 { 489 {