xt / xcx-book · Commits

Go to a project

Commit f81b45638f68825fbe0209aa16d5268024b39052

Authored by vking
1 parent 6ae20bc9
build: skipped

顾客端，买单信息调整

Inline Side-by-side
Showing 4 changed files with 31 additions and 11 deletions
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 <view class="title">红包</view> 6 <view class="title">红包</view>
7 <view class="close"></view> 7 <view class="close"></view>
8 </view> 8 </view>
9 - <view class="tips">红包均为一次使用，不找零、不兑现，每次买单抵扣不超过消费总额</view> 9 + <view class="tips">红包均为一次使用，不找零、不兑现，每次买单抵扣不超过消费金额</view>
10 <view class="content"> 10 <view class="content">
11 <view class="msg flex-ll"> 11 <view class="msg flex-ll">
12 你选中了<text class="light">{{checkedNum}}</text>个红包，共可抵扣<text class="light">￥{{checkoutObj.subsidy_price}}</text> 12 你选中了<text class="light">{{checkedNum}}</text>个红包，共可抵扣<text class="light">￥{{checkoutObj.subsidy_price}}</text>
@@ -86,12 +86,20 @@ Page({ @@ -86,12 +86,20 @@ Page({
86 this.GetOrderInfoRun() 86 this.GetOrderInfoRun()
87 } 87 }
88 if(checkout.discount && checkout.discount.length>0){ 88 if(checkout.discount && checkout.discount.length>0){
89 - let subsidy_price=0 89 + let subsidy_price=0,subsidy_price_pt=0,subsidy_price_sj=0
90 checkout.discount.forEach(q=>{ 90 checkout.discount.forEach(q=>{
91 if(q.checked){ 91 if(q.checked){
92 - subsidy_price+=q.price/1 92 + let price=q.price/1
  93 + subsidy_price+=price
  94 + if(q.owner==1) {//平台红包
  95 + subsidy_price_pt += price
  96 + }else{
  97 + subsidy_price_sj+= price
  98 + }
93 } 99 }
94 }) 100 })
  101 + checkout.subsidy_price_pt=subsidy_price_pt.toFixed(2)
  102 + checkout.subsidy_price_sj=subsidy_price_sj.toFixed(2)
95 checkout.subsidy_price=subsidy_price.toFixed(2) 103 checkout.subsidy_price=subsidy_price.toFixed(2)
96 } 104 }
97 } 105 }
@@ -38,7 +38,7 @@ @@ -38,7 +38,7 @@
38 <view class="waiting-txt">待支付</view> 38 <view class="waiting-txt">待支付</view>
39 </view> 39 </view>
40 <view class="list flex-lr"> 40 <view class="list flex-lr">
41 - <view class="list-name">消费总额</view> 41 + <view class="list-name">消费金额</view>
42 <view class="list-val">¥ {{checkout.price}}</view> 42 <view class="list-val">¥ {{checkout.price}}</view>
43 </view> 43 </view>
44 <view class="list flex-lr" bindtap="discountShow"> 44 <view class="list flex-lr" bindtap="discountShow">
@@ -49,7 +49,7 @@ @@ -49,7 +49,7 @@
49 </view> 49 </view>
50 </view> 50 </view>
51 <view class="list flex-lr"> 51 <view class="list flex-lr">
52 - <view class="list-name">应付金额</view> 52 + <view class="list-name">需付金额</view>
53 <view class="list-val should_price">¥{{checkout.should_price}}</view> 53 <view class="list-val should_price">¥{{checkout.should_price}}</view>
54 </view> 54 </view>
55 <view class="list flex-lr" wx:if="{{checkout.bill_list.length>0}}" bindtap="displayOrderImages"> 55 <view class="list flex-lr" wx:if="{{checkout.bill_list.length>0}}" bindtap="displayOrderImages">
@@ -75,12 +75,16 @@ @@ -75,12 +75,16 @@
75 <view class="waiting-txt">已买单</view> 75 <view class="waiting-txt">已买单</view>
76 </view> 76 </view>
77 <view class="list flex-lr"> 77 <view class="list flex-lr">
78 - <view class="list-name">消费总额</view> 78 + <view class="list-name">消费金额</view>
79 <view class="list-val">¥ {{checkout.price}}</view> 79 <view class="list-val">¥ {{checkout.price}}</view>
80 </view> 80 </view>
81 - <view class="list flex-lr">  
82 - <view class="list-name">红　　包</view>  
83 - <view class="list-val">-¥ {{checkout.subsidy_price}}</view> 81 + <view class="list flex-lr" wx:if="{{checkout.subsidy_price_sj>0}}">
  82 + <view class="list-name">店铺红包</view>
  83 + <view class="list-val">-¥ {{checkout.subsidy_price_sj}}</view>
  84 + </view>
  85 + <view class="list flex-lr" wx:if="{{checkout.subsidy_price_pt>0}}">
  86 + <view class="list-name">平台红包</view>
  87 + <view class="list-val">-¥ {{checkout.subsidy_price_pt}}</view>
84 </view> 88 </view>
85 <view class="list flex-lr"> 89 <view class="list flex-lr">
86 <view class="list-name">实付金额</view> 90 <view class="list-name">实付金额</view>
@@ -98,7 +102,15 @@ @@ -98,7 +102,15 @@
98 <view class="list-name">备注信息</view> 102 <view class="list-name">备注信息</view>
99 <view class="list-val">{{checkout.remark}}</view> 103 <view class="list-val">{{checkout.remark}}</view>
100 </view> 104 </view>
  105 + <view class="list flex-lr" wx:if="{{checkout.subsidy_price>0}}">
  106 + <view class="list-name">其他说明</view>
  107 + <view class="list-val">红包不找零，不可拆开使用</view>
  108 + </view>
101 <view class="list flex-lr pay-time"> 109 <view class="list flex-lr pay-time">
  110 + <view class="list-name">支付方式</view>
  111 + <view class="list-val">微信支付</view>
  112 + </view>
  113 + <view class="list flex-lr">
102 <view class="list-name">买单时间</view> 114 <view class="list-name">买单时间</view>
103 <view class="list-val">{{util.unixtoTime(checkout.pay_time,'YYYY-MM-DD HH:II')}}</view> 115 <view class="list-val">{{util.unixtoTime(checkout.pay_time,'YYYY-MM-DD HH:II')}}</view>
104 </view> 116 </view>
@@ -634,10 +634,10 @@ @@ -634,10 +634,10 @@
634 "scene": null 634 "scene": null
635 }, 635 },
636 { 636 {
637 - "id": 80, 637 + "id": 79,
638 "name": "pack-checkout/pages/index", 638 "name": "pack-checkout/pages/index",
639 "pathName": "pack-checkout/pages/index", 639 "pathName": "pack-checkout/pages/index",
640 - "query": "rid=64793&sid=80", 640 + "query": "rid=66717&sid=1001",
641 "scene": null 641 "scene": null
642 }, 642 },
643 { 643 {