顾客端，买单信息调整

@@ -6,7 +6,7 @@
             <view class="title">红包</view>
             <view class="close"></view>
         </view>
-        <view class="tips">红包均为一次使用，不找零、不兑现，每次买单抵扣不超过消费总额</view>
+        <view class="tips">红包均为一次使用，不找零、不兑现，每次买单抵扣不超过消费金额</view>
         <view class="content">
             <view class="msg flex-ll">
                 你选中了<text class="light">{{checkedNum}}</text>个红包，共可抵扣<text class="light">￥{{checkoutObj.subsidy_price}}</text>

@@ -86,12 +86,20 @@ Page({
           this.GetOrderInfoRun()
         }
         if(checkout.discount && checkout.discount.length>0){
-          let subsidy_price=0
+          let subsidy_price=0,subsidy_price_pt=0,subsidy_price_sj=0
           checkout.discount.forEach(q=>{
             if(q.checked){
-              subsidy_price+=q.price/1
+              let price=q.price/1
+              subsidy_price+=price
+              if(q.owner==1) {//平台红包
+                subsidy_price_pt += price
+              }else{
+                subsidy_price_sj+= price
+              }
             }
           })
+          checkout.subsidy_price_pt=subsidy_price_pt.toFixed(2)
+          checkout.subsidy_price_sj=subsidy_price_sj.toFixed(2)
           checkout.subsidy_price=subsidy_price.toFixed(2)
         }
       }

@@ -38,7 +38,7 @@
                 <view class="waiting-txt">待支付</view>
             </view>
             <view class="list flex-lr">
-                <view class="list-name">消费总额</view>
+                <view class="list-name">消费金额</view>
                 <view class="list-val">¥ {{checkout.price}}</view>
             </view>
             <view class="list flex-lr" bindtap="discountShow">
@@ -49,7 +49,7 @@
                 </view>
             </view>
             <view class="list flex-lr">
-                <view class="list-name">应付金额</view>
+                <view class="list-name">需付金额</view>
                 <view class="list-val should_price">¥{{checkout.should_price}}</view>
             </view>
             <view class="list flex-lr" wx:if="{{checkout.bill_list.length>0}}" bindtap="displayOrderImages">
@@ -75,12 +75,16 @@
                 <view class="waiting-txt">已买单</view>
             </view>
             <view class="list flex-lr">
-                <view class="list-name">消费总额</view>
+                <view class="list-name">消费金额</view>
                 <view class="list-val">¥ {{checkout.price}}</view>
             </view>
-            <view class="list flex-lr">
-                <view class="list-name">红　　包</view>
-                <view class="list-val">-¥ {{checkout.subsidy_price}}</view>
+            <view class="list flex-lr" wx:if="{{checkout.subsidy_price_sj>0}}">
+                <view class="list-name">店铺红包</view>
+                <view class="list-val">-¥ {{checkout.subsidy_price_sj}}</view>
+            </view>
+            <view class="list flex-lr" wx:if="{{checkout.subsidy_price_pt>0}}">
+                <view class="list-name">平台红包</view>
+                <view class="list-val">-¥ {{checkout.subsidy_price_pt}}</view>
             </view>
             <view class="list flex-lr">
                 <view class="list-name">实付金额</view>
@@ -98,7 +102,15 @@
                 <view class="list-name">备注信息</view>
                 <view class="list-val">{{checkout.remark}}</view>
             </view>
+            <view class="list flex-lr" wx:if="{{checkout.subsidy_price>0}}">
+                <view class="list-name">其他说明</view>
+                <view class="list-val">红包不找零，不可拆开使用</view>
+            </view>
             <view class="list flex-lr pay-time">
+                <view class="list-name">支付方式</view>
+                <view class="list-val">微信支付</view>
+            </view>
+            <view class="list flex-lr">
                 <view class="list-name">买单时间</view>
                 <view class="list-val">{{util.unixtoTime(checkout.pay_time,'YYYY-MM-DD HH:II')}}</view>
             </view>

@@ -634,10 +634,10 @@
 					"scene": null
 				},
 				{
-					"id": 80,
+					"id": 79,
 					"name": "pack-checkout/pages/index",
 					"pathName": "pack-checkout/pages/index",
-					"query": "rid=64793&sid=80",
+					"query": "rid=66717&sid=1001",
 					"scene": null
 				},
 				{