From 97c6001038d46ad2d0a5d9fb13b0be9392447505 Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Sat, 1 Jul 2023 16:21:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/components/coupon/index.js | 48 +++++++++++++++++++++++---
 pages/order/coupon/index.js            | 33 ++++++++++++++++--
 pages/order/movie/index.js             | 21 +++++++----
 pages/order/movie/index.wxml           |  2 +-
 pages/order/postOrder/index.js         | 14 +++++---
 pages/order/postOrder/index.wxml       |  2 +-
 pages/order/roadOrder/index.js         | 11 +++---
 pages/order/roadOrder/index.wxml       |  2 +-
 pages/order/scene/index.js             | 30 +++++++++-------
 pages/order/scene/index.wxml           |  2 +-
 10 files changed, 125 insertions(+), 40 deletions(-)

diff --git a/pages/order/components/coupon/index.js b/pages/order/components/coupon/index.js
index 14cf5dc..0fbb534 100644
--- a/pages/order/components/coupon/index.js
+++ b/pages/order/components/coupon/index.js
@@ -1,4 +1,5 @@
 // pages/order/components/coupon/index.js
+import commonApi from "../../../../utils/https/common"
 let app = getApp()
 Component({
   /**
@@ -23,20 +24,57 @@ Component({
   },
   pageLifetimes: {
     show: function() {
-      this.setData({
-        coupon:app.globalData.couponInfo
-      })
+      this.getMaxCoupon()
     }
   },
-
+  lifetimes:{
+    attached(){
+    },
+  },
   /**
    * 组件的方法列表
    */
   methods: {
     setNullCoupon:function(){
+      app.globalData.couponInfo = null
       this.setData({
         coupon:null
       })
-    }
+    },
+    getMaxCoupon(){
+      // console.log(app.globalData.couponInfo);
+      console.log(this.data.coupon);
+      if (app.globalData.couponInfo===false) {
+        this.setData({
+          coupon:null
+        })
+        this.triggerEvent('getNewCoupon',null);
+      }else{
+        commonApi.user_post('coupon/use_max_coupon_list',{
+          money:this.data.money,
+          sku_ids:this.data.sku
+        }).then(res=>{
+          if (app.globalData.couponInfo&&app.globalData.couponInfo.hasOwnProperty('SubCoupon')) {
+            this.setData({
+              coupon:app.globalData.couponInfo
+            })
+            this.triggerEvent('getNewCoupon',app.globalData.couponInfo);
+            console.log("我用的原来的数据");
+          }else{
+            console.log("我用的新的数据");
+            if ( Object.keys(res.data).length!=0) {
+              app.globalData.couponInfo = res.data
+              this.setData({
+                coupon:res.data
+              })
+               console.log(this.data.coupon);
+              this.triggerEvent('getNewCoupon',res.data);
+            }
+          }
+        })
+      }
+
   }
+  },
+
 })
diff --git a/pages/order/coupon/index.js b/pages/order/coupon/index.js
index 1b7c0c3..5a3d7b1 100644
--- a/pages/order/coupon/index.js
+++ b/pages/order/coupon/index.js
@@ -15,6 +15,7 @@ Page({
   /**
    * 生命周期函数--监听页面加载
    */
+  
   onLoad: function (options) {
     this.getList(options)
   },
@@ -30,6 +31,27 @@ Page({
       this.setData({
         list:res.data
       })
+      this.getMaxC(options)
+    })
+  },
+  //获取最高优惠
+  getMaxC(options){
+    commonApi.user_post('coupon/use_max_coupon_list',{
+      money:options.money,
+      sku_ids:options.sku
+    }).then(res=>{
+      console.log(app.globalData.couponInfo);
+
+      app.globalData.couponInfo?app.globalData.couponInfo:app.globalData.couponInfo= res.data;
+      let listT = this.data.list
+      listT.forEach(item => {
+          if (item.id ==  app.globalData.couponInfo.id) {
+              item.selected = true
+          }
+      });
+      this.setData({
+        list:listT
+      })
     })
   },
   selectIt:function(e){
@@ -53,10 +75,15 @@ Page({
     list.map(item=>{
       if(item.selected){
         coupon = item;
+        item.SubCoupon = true
       }
     })
-    console.log(coupon)
-    app.globalData.couponInfo = coupon;
+    if (coupon===null) {
+      app.globalData.couponInfo = false
+    }else{
+      app.globalData.couponInfo = coupon;
+    }
+
     util.back()
   },
 
@@ -71,7 +98,7 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    app.globalData.couponInfo = null;
+
   },
 
   /**
diff --git a/pages/order/movie/index.js b/pages/order/movie/index.js
index 7a449ef..d722ee3 100644
--- a/pages/order/movie/index.js
+++ b/pages/order/movie/index.js
@@ -13,7 +13,7 @@ Page({
     tel:'',
     product:null,
     price:0,
-    coupon:null,
+    coupon:app.globalData.couponInfo,
 		prizeId:null,
 		num:0,
 		sPrice:0,
@@ -24,7 +24,10 @@ Page({
    * 生命周期函数--监听页面加载
    */
 	onLoad: function (options) {
-		console.log(options);
+    app.globalData.couponInfo = null
+    this.setData({
+      coupon:app.globalData.couponInfo
+    })
     this.setData({
       prizeId:wx.getStorageSync('prizeId')
     })
@@ -123,22 +126,26 @@ Page({
 		this.setData({
 			hideMx:!this.data.hideMx
 		})
-	},
+  },
+  //获取最高优惠券
+      getNewCoupon(e){
+        this.setData({
+          coupon:e.detail
+       })
+     },
 
   /**
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-		this.setData({
-			coupon:app.globalData.couponInfo,
-		})
+
   },
 
   /**
    * 生命周期函数--监听页面隐藏
    */
   onHide: function () {
-    app.globalData.couponInfo = null
+  
   },
 
   /**
diff --git a/pages/order/movie/index.wxml b/pages/order/movie/index.wxml
index a749339..0172212 100644
--- a/pages/order/movie/index.wxml
+++ b/pages/order/movie/index.wxml
@@ -31,7 +31,7 @@
 		<text>手机号码：</text>
 		<input value="{{tel}}" type="number" bindinput="changeTel" placeholder="输入您的手机号"></input>
 	</view>
-<coupon money="{{price}}" sku="{{product.product.sku_info.id}}"></coupon>
+<coupon bind:getNewCoupon = 'getNewCoupon' money="{{price}}" sku="{{product.product.sku_info.id}}"></coupon>
 
 
 <view class="fix-info {{!hideMx?'hide':''}}">
diff --git a/pages/order/postOrder/index.js b/pages/order/postOrder/index.js
index f847587..265207d 100644
--- a/pages/order/postOrder/index.js
+++ b/pages/order/postOrder/index.js
@@ -12,7 +12,7 @@ Page({
     from: null,
     address: null,
     postFee: 0,
-    coupon: null,
+    coupon:app.globalData.couponInfo,
     sku_id: '',
     kjId: null,
     gp_id: null,
@@ -255,6 +255,12 @@ Page({
     })
     this.changePrice()
   },
+    //获取最高优惠券
+    getNewCoupon(e){
+        this.setData({
+          coupon:e.detail
+       })
+     },
 
   /**
    * 生命周期函数--监听页面初次渲染完成
@@ -267,9 +273,9 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    this.setData({
-      coupon: app.globalData.couponInfo
-    })
+    // this.setData({
+    //   coupon: app.globalData.couponInfo
+    // })
     // 获取补贴
     // if (this.data.product.length == 1) {
     //   commonApi.user_post("product/getProductAllowancePrice", {
diff --git a/pages/order/postOrder/index.wxml b/pages/order/postOrder/index.wxml
index 6c3ab93..8753b18 100644
--- a/pages/order/postOrder/index.wxml
+++ b/pages/order/postOrder/index.wxml
@@ -47,7 +47,7 @@
     </view>
   </view>
 </view>
-<coupon id="coupon" wx:if="{{!kjId && !gp_id && flag!='mix'}}" money="{{showPrice + postFee}}" sku="{{sku_id}}"></coupon>
+<coupon bind:getNewCoupon = 'getNewCoupon'  id="coupon" wx:if="{{!kjId && !gp_id && flag!='mix'}}" money="{{showPrice + postFee}}" sku="{{sku_id}}"></coupon>
 <view style="height:113rpx"></view>
 <view class="fixed-bottom" wx:if="{{product}}">
   <view class="fixed-price-box" wx:if="{{!prizeId}}"><text>合计：</text><text
diff --git a/pages/order/roadOrder/index.js b/pages/order/roadOrder/index.js
index 06cffba..1c222ff 100644
--- a/pages/order/roadOrder/index.js
+++ b/pages/order/roadOrder/index.js
@@ -20,7 +20,7 @@ Page({
     remark:"",
     editId:null,
     price:0,
-    coupon:null,
+    coupon:app.globalData.couponInfo,
     sku_ids:"",
     prizeId:null
   },
@@ -270,6 +270,12 @@ Page({
     })
     
   },
+      //获取最高优惠券
+  getNewCoupon(e){
+        this.setData({
+          coupon:e.detail
+       })
+     },
   // 一日游合同确认签字
   // ondayConfirm:function(){
   //   let linkmans = this.data.linkmans,tourist_info=[],sku=this.data.sku;
@@ -324,9 +330,6 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    this.setData({
-      coupon:app.globalData.couponInfo
-    })
     if(this.data.editId){
       // 如果是去编辑的
       let editId = this.data.editId;
diff --git a/pages/order/roadOrder/index.wxml b/pages/order/roadOrder/index.wxml
index c28f663..f81629e 100644
--- a/pages/order/roadOrder/index.wxml
+++ b/pages/order/roadOrder/index.wxml
@@ -29,7 +29,7 @@
     <input type="text" bindinput="inputRemark" placeholder="选填"></input>
   </view>
 </view>
-<coupon money="{{price}}" sku="{{sku_ids}}"></coupon>
+<coupon bind:getNewCoupon = 'getNewCoupon' money="{{price}}" sku="{{sku_ids}}"></coupon>
 <!-- <view class="user-box">
   <view class="user-item" style="border:none">
     <image style="width:32rpx" src="https://static.ticket.sz-trip.com/xcxImages/other/hetong.png" mode="widthFix"></image>
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index e388033..ebf2e9c 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -16,7 +16,7 @@ Page({
     remark: "",
     singlePrice: 0,
     type: null,
-    coupon: app.globalData.couponInfo,
+    coupon:null,
     isLogin: false,
     kjId: null,
     gp_id: null,
@@ -36,8 +36,6 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-		console.log(app.globalData.product);
-		console.log(options.isCar);
     this.setData({
       product: app.globalData.product,
       type: options.type,
@@ -83,13 +81,13 @@ Page({
         title: '订单价格发生变化，请重新选择优惠券',
         icon: 'none'
       })
-      if (!this.data.kjId && !this.data.gp_id && this.data.product.isGroup != 1) {
-        this.couponCom.setNullCoupon()
-      }
-      app.globalData.couponInfo = null;
-      this.setData({
-        coupon: null
-      })
+      // if (!this.data.kjId && !this.data.gp_id && this.data.product.isGroup != 1) {
+      //   this.couponCom.setNullCoupon()
+      // }
+      // app.globalData.couponInfo = null;
+      // this.setData({
+      //   coupon: null
+      // })
     }
     let productNum = linkmanList.length == 0 ? 1 : this.data.productNum > linkmanList.length ? this.data.productNum : linkmanList.length;
     if (this.data.gp_id) {
@@ -361,6 +359,12 @@ Page({
     })
     this.changePrice()
   },
+  //获取最高优惠券
+  getNewCoupon(e){
+   this.setData({
+      coupon:e.detail
+   })
+  },
 
   /**
    * 生命周期函数--监听页面初次渲染完成
@@ -385,9 +389,9 @@ Page({
         }
       })
     }
-    this.setData({
-      coupon: app.globalData.couponInfo
-    })
+    // this.setData({
+    //   coupon: app.globalData.couponInfo
+    // })
     // 获取补贴
     // if (this.data.product) {
     //   commonApi.user_post("product/getProductAllowancePrice", {
diff --git a/pages/order/scene/index.wxml b/pages/order/scene/index.wxml
index a454ed2..0dac30d 100644
--- a/pages/order/scene/index.wxml
+++ b/pages/order/scene/index.wxml
@@ -35,7 +35,7 @@
     </view>
   </view>
 
-  <coupon wx:if="{{!kjId && !gp_id && type!='activity' && product && product.isGroup!=1 && isCar=='single'}}" id="coupon"
+  <coupon bind:getNewCoupon = 'getNewCoupon' wx:if="{{!kjId && !gp_id && type!='activity' && product && product.isGroup!=1 && isCar=='single'}}" id="coupon"
     money="{{singlePrice * productNum}}" sku="{{product.sku.id}}"></coupon>
 
   <view class="box" wx:if="{{type!='activity' && product && product.isGroup!=1}}">