From ea84089b010975de74515b22c8976556a2918a67 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 5 Sep 2024 11:12:04 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E5=A4=9A=E4=B8=AA?=
 =?UTF-8?q?=E6=9C=89=E9=97=A8=E7=A5=A8=E7=A6=81=E7=94=A8=E4=BC=98=E6=83=A0?=
 =?UTF-8?q?=E5=88=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/orderList/index.js   | 15 ++++++++++++---
 pages/order/orderList/index.wxml | 14 +++++++++++---
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/pages/order/orderList/index.js b/pages/order/orderList/index.js
index 5793f24..27c84fd 100644
--- a/pages/order/orderList/index.js
+++ b/pages/order/orderList/index.js
@@ -22,7 +22,10 @@ Page({
   allowance_data: null,
   allowance_price: 0,
   flag:null,
-  linkmanList:[]
+  linkmanList:[],
+  finalPrice: 0,
+
+  showCoupon: false,
   },
 
   /**
@@ -35,6 +38,7 @@ Page({
       kjId: app.globalData.kjId,
       gp_id: app.globalData.gp_id || app.globalData.team_id,
       flag:options.flag,
+      showCoupon: (app.globalData.list || []).length<=0,
       // linkmanList: app.globalData.linkmanList
     })
     console.log('-------------',this.data.ticketList);
@@ -94,10 +98,12 @@ Page({
         coupon: null
       })
     }
+
     this.setData({
       showPrice: app.globalData.kjId ? 0 : price
     })
   },
+
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
@@ -111,12 +117,15 @@ Page({
       }
     })
 	},
-	    //获取最高优惠券
-			getNewCoupon(e){
+	//获取最高优惠券
+	getNewCoupon(e){
         this.setData({
           coupon:e.detail
        })
      },
+
+
+
   /**
    * 生命周期函数--监听页面显示
    */
diff --git a/pages/order/orderList/index.wxml b/pages/order/orderList/index.wxml
index a783dba..29fc4b1 100644
--- a/pages/order/orderList/index.wxml
+++ b/pages/order/orderList/index.wxml
@@ -66,12 +66,20 @@
     <view style="flex-shrink:0">订单备注：</view>
     <input type="text" bindinput="inputRemark" data-index="{{index}}" placeholder="选填"></input>
   </view> -->
-<coupon bind:getNewCoupon = 'getNewCoupon'  id="coupon" wx:if="{{!kjId && !gp_id}}" money="{{showPrice + postFee}}" sku="{{sku_id}}"></coupon>
+<coupon bind:getNewCoupon = 'getNewCoupon'  id="coupon" wx:if="{{showCoupon && !kjId && !gp_id}}" money="{{showPrice + postFee}}" sku="{{sku_id}}"></coupon>
 
 <view class="fixed-bottom">
     <view class="fixed-price-box">
-		<text>合计:</text>
-		<text class="price">¥{{((showPrice + postFee - (coupon?coupon.activity.money:0))>0?(showPrice + postFee - (coupon?coupon.activity.money:0)):0)/100}}</text>
+        
+      <view wx:if="{{coupon && coupon.activity.discount_type != 'pricebreak'}}">
+        <text>合计：</text><text
+        class="price">¥{{((showPrice + postFee)* coupon.activity.fold/10)>0?((showPrice + postFee)* coupon.activity.fold/10)/100:0}}</text>
+      </view>
+      <view wx:else>
+        <text>合计：</text>
+        <text class="price">¥{{((showPrice + postFee - (coupon?coupon.activity.money:0))>0?(showPrice + postFee - (coupon?coupon.activity.money:0)):0)/100}}</text>
+      </view>
+
     </view>
     <view class="fixed-btn" bindtap="order">下一步</view>
 </view>
\ No newline at end of file