Commit 9c084f9a221d2787591374a2c78a399a8aa0f5fa

Authored by vking
1 parent e275aac0

pay

@@ -37,6 +37,7 @@ Component({ @@ -37,6 +37,7 @@ Component({
37 }, 37 },
38 fail:(efail)=>{ 38 fail:(efail)=>{
39 console.log('wx.chooseInvoiceTitle',efail) 39 console.log('wx.chooseInvoiceTitle',efail)
  40 + if(efail.errMsg== "chooseInvoiceTitle:fail cancel") return;
40 wx.showModal({ 41 wx.showModal({
41 title: '授权提示', 42 title: '授权提示',
42 content: '您拒绝了获取发票抬头,请点击确定打开授权', 43 content: '您拒绝了获取发票抬头,请点击确定打开授权',
@@ -114,7 +114,6 @@ Page({ @@ -114,7 +114,6 @@ Page({
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]
116 }) 116 })
117 - console.log('setInvoice',invoice)  
118 App.Customer.SetInvoice(invoice).then(res=>{ 117 App.Customer.SetInvoice(invoice).then(res=>{
119 util.toast('发票已提交','none') 118 util.toast('发票已提交','none')
120 }) 119 })
@@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
16 </view> 16 </view>
17 </view> 17 </view>
18 <view class="content invoice"> 18 <view class="content invoice">
19 - <view class="item flex-lr" bindtap="setInvoice"> 19 + <view class="item flex-lr">
20 <view>发票</view> 20 <view>发票</view>
21 <invoice bindevent="setInvoice"> 21 <invoice bindevent="setInvoice">
22 <view class="flex-rr invoice-right"> 22 <view class="flex-rr invoice-right">
@@ -47,7 +47,7 @@ @@ -47,7 +47,7 @@
47 </view> 47 </view>
48 <view class="list flex-lr"> 48 <view class="list flex-lr">
49 <view class="list-name">应付金额</view> 49 <view class="list-name">应付金额</view>
50 - <view class="list-val should_price">¥{{checkout.price-user.price>0?checkout.price-user.price:0}}</view> 50 + <view class="list-val should_price">¥{{checkout.should_price}}</view>
51 </view> 51 </view>
52 <view class="list flex-lr" wx:if="{{checkout.bill_list}}"> 52 <view class="list flex-lr" wx:if="{{checkout.bill_list}}">
53 <view class="list-name">消费清单</view> 53 <view class="list-name">消费清单</view>
@@ -61,7 +61,7 @@ @@ -61,7 +61,7 @@
61 <view class="list-name">备注信息</view> 61 <view class="list-name">备注信息</view>
62 <view class="list-val">{{checkout.remark}}</view> 62 <view class="list-val">{{checkout.remark}}</view>
63 </view> 63 </view>
64 - <view class="checkout-get" bindtap="pay">立即支付{{checkout.price-user.price>0?checkout.price-user.price:0.01}}元</view> 64 + <view class="checkout-get" bindtap="pay">立即支付{{checkout.should_price}}元</view>
65 </view> 65 </view>
66 <view class="money-tips">注:消费清单,离店时请到前台索要;</view> 66 <view class="money-tips">注:消费清单,离店时请到前台索要;</view>
67 </block> 67 </block>