From 1e9381784c6db41200baf2f7a7acaba13f1c3313 Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Tue, 6 Aug 2024 19:01:15 +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

---
 app.js                                   |  2 +-
 pages/info/postProductInfo/index.js      |  1 +
 pages/info/sceneProductInfo/index.js     |  1 +
 pages/order/components/coupon/index.wxml |  9 ++++-
 pages/order/coupon/index.wxml            |  5 ++-
 pages/order/coupon/index.wxss            | 12 +++++++
 pages/order/postOrder/index.js           | 16 +++++++--
 pages/order/postOrder/index.wxml         | 20 +++++++++--
 pages/order/scene/index.js               | 44 ++++++++++++++++++++----
 pages/order/scene/index.wxml             |  2 +-
 pages/user/cartlist/list.js              |  1 +
 pages/user/coupon/index.wxml             |  9 ++++-
 12 files changed, 106 insertions(+), 16 deletions(-)

diff --git a/app.js b/app.js
index d692356..79152fd 100644
--- a/app.js
+++ b/app.js
@@ -21,7 +21,7 @@ App({
       unique_key: "wechatxcx"
     }).then(res => {
       let data = JSON.parse(res.data);
-      data.isTest = data.isTest138? true : false;
+      data.isTest = data.isTest139? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/info/postProductInfo/index.js b/pages/info/postProductInfo/index.js
index 2ce7d62..da9458e 100644
--- a/pages/info/postProductInfo/index.js
+++ b/pages/info/postProductInfo/index.js
@@ -336,6 +336,7 @@ Page({
                     }];
                     app.globalData.postProduct = product;
                     app.globalData.retailId = this.data.retailId;
+                    app.globalData.listName = null
                     wx.navigateTo({
                         url: '/pages/order/postOrder/index',
                     })
diff --git a/pages/info/sceneProductInfo/index.js b/pages/info/sceneProductInfo/index.js
index 058a4f4..ad008c9 100644
--- a/pages/info/sceneProductInfo/index.js
+++ b/pages/info/sceneProductInfo/index.js
@@ -358,6 +358,7 @@ Page({
       } else {
         app.globalData.postProduct = []
         app.globalData.list = []
+        app.globalData.listName = null
         if (this.data.skuFlag == 'order') {
           if (e.currentTarget.dataset.disable === 1) return;
           util.pagePoint({
diff --git a/pages/order/components/coupon/index.wxml b/pages/order/components/coupon/index.wxml
index 1ae1794..0db1d8a 100644
--- a/pages/order/components/coupon/index.wxml
+++ b/pages/order/components/coupon/index.wxml
@@ -2,7 +2,14 @@
 <navigator url="/pages/order/coupon/index?money={{money}}&sku={{sku}}" class="box">
   <view class="box-title">
     <view style="flex:1">优惠券</view>
-    <view wx:if="{{coupon}}">-{{coupon.activity.money/100}}</view>
+    <view wx:if="{{coupon}}">
+      <view wx:if="{{coupon.activity.discount_type == 'pricebreak'}}">
+        -{{coupon.activity.money/100}}        
+      </view>
+      <view wx:else>
+        {{coupon.activity.fold}}折
+      </view>
+    </view>
     <view class="coupon-btn" wx:else>请选择</view>
   </view>
 </navigator>
diff --git a/pages/order/coupon/index.wxml b/pages/order/coupon/index.wxml
index 1713323..3a169d0 100644
--- a/pages/order/coupon/index.wxml
+++ b/pages/order/coupon/index.wxml
@@ -2,7 +2,10 @@
 <title title="优惠券"></title>
 <view wx:if="{{list.length>0}}">
   <view class="coupon-item" wx:for="{{list}}">
-    <view class="money">{{item.activity.money/100}}</view>
+    <view class="money" wx:if="{{item.activity.discount_type == 'pricebreak'}}">{{item.activity.money/100}}</view>
+    <view class="money1" wx:else>
+      {{item.activity.fold}}
+    </view>
     <view class="coupon-info">
       <view>{{item.activity.name}}</view>
       <view class="couon-date" wx:if="{{item.end_time}}">{{item.end_time}}到期</view>
diff --git a/pages/order/coupon/index.wxss b/pages/order/coupon/index.wxss
index 9277006..a8cfad0 100644
--- a/pages/order/coupon/index.wxss
+++ b/pages/order/coupon/index.wxss
@@ -20,10 +20,22 @@ page {
   font-weight: 500;
   flex-shrink: 0;
 }
+.coupon-item .money1 {
+  color: #D62828;
+  font-size: 47rpx;
+  width: 187rpx;
+  text-align: center;
+  font-weight: 500;
+  flex-shrink: 0;
+}
 .coupon-item .money::before {
   content: '￥';
   font-size: 30rpx;
 }
+.coupon-item .money1::after {
+  content: '折';
+  font-size: 30rpx;
+}
 .coupon-info {
   flex: 1;
   margin-right: 20rpx;
diff --git a/pages/order/postOrder/index.js b/pages/order/postOrder/index.js
index f48f637..0dfa8ad 100644
--- a/pages/order/postOrder/index.js
+++ b/pages/order/postOrder/index.js
@@ -22,7 +22,8 @@ Page({
     allowance_price: 0,
     showAllowance: false,
     flag:null,
-    isCar:'single'
+    isCar:'single',
+    showYhq:null
   },
 
   /**
@@ -35,7 +36,8 @@ Page({
       gp_id: app.globalData.gp_id || app.globalData.team_id,
       prizeId: wx.getStorageSync('prizeId'),
       flag:options.flag,
-      isCar:options.isCar
+      isCar:options.isCar,
+      showYhq:app.globalData.listName?false:true
     })
     let price = 0, sku_id = [];
     app.globalData.postProduct.map(item => {
@@ -57,6 +59,16 @@ Page({
     }
 	console.log(this.data.showPrice)
   },
+  price() {
+    let allPrice
+    if (this.data.coupon) {
+      if (this.data.coupon.discount_type == 'pricebreak') {
+        return allPrice = this.data.showPrice + this.data.postFee - this.data.coupon.activity.money>0?this.data.showPrice + this.data.postFee - this.data.coupon.activity.money/100:0
+     } else {
+      return allPrice = (this.data.showPrice* this.data.coupon.activity.fold)/ 10 + this.data.postFee
+     }
+    }
+  },
   changeAllowance: function () {
     this.setData({
       showAllowance: !this.data.showAllowance
diff --git a/pages/order/postOrder/index.wxml b/pages/order/postOrder/index.wxml
index 7716a2e..f46ff39 100644
--- a/pages/order/postOrder/index.wxml
+++ b/pages/order/postOrder/index.wxml
@@ -47,11 +47,25 @@
     </view>
   </view>
 </view>
-<coupon bind:getNewCoupon = 'getNewCoupon'  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' && showYhq}}" 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
-      class="price">¥{{((showPrice + postFee - (coupon?coupon.activity.money:0))>0?(showPrice + postFee - (coupon?coupon.activity.money:0)):0)/100}}</text>
+  <view class="fixed-price-box" wx:if="{{!prizeId}}">
+    <view wx:if="{{coupon && showYhq}}">
+      <view wx:if="{{coupon && coupon.activity.discount_type == 'pricebreak'}}">
+        <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 wx:else>
+        <text>合计：</text><text
+        class="price">¥{{((showPrice + postFee)* coupon.activity.fold/10)>0?((showPrice + postFee)* coupon.activity.fold/10)/100:0}}</text>
+      </view>
+    </view>
+    <view wx:else>
+      <text>合计：</text><text
+        class="price">¥{{showPrice + postFee>0?(showPrice + postFee)/100:0}}</text>
+    </view>
+    
   </view>
   <view class="fixed-price-box" wx:else><text>合计：</text><text class="price">¥{{postFee?(0+postFee)/100:0}}</text></view>
   <view class="fixed-btn" bindtap="order">下一步</view>
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index 86b2b38..f5a0ada 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -44,6 +44,7 @@ Page({
     bookingInfoTitle: "",
     showDate:false,
     showDate2:false,
+    showYhq:null
   },
 
   /**
@@ -64,9 +65,10 @@ Page({
       is_authentication:app.globalData.product.sku.sku_model.is_authentication,
       is_real_name:app.globalData.product.sku.sku_model.is_real_name,
       date: app.globalData.product.date,
-      time: app.globalData.product.time
+      time: app.globalData.product.time,
+      showYhq:app.globalData.listName?false:true
     })
-    console.log('-------',this.data.date,this.data.time);
+    console.log('-------',this.data.showYhq,this.data.time);
     // debugger
     console.log('-------',app.globalData.product.sku.sku_model.is_need_idcard);
     console.log('---是否实名----',app.globalData.product.sku.sku_model.is_authentication);
@@ -87,7 +89,7 @@ Page({
   }
     this.setData({
       product: app.globalData.product,
-      singlePrice: app.globalData.product?app.globalData.product.date.price :(this.data.gp_id ? app.globalData.product.sku.event_price : app.globalData.product.sku.price)
+      singlePrice: app.globalData.product.date?app.globalData.product.date.price :(this.data.gp_id ? app.globalData.product.sku.event_price : app.globalData.product.sku.price)
       // singlePrice: this.data.gp_id ? app.globalData.product.sku.event_price : app.globalData.product.sku.price
     })
     console.log(this.data.singlePrice);
@@ -140,7 +142,17 @@ Page({
       // this.setData({
       //   singlePrice:app.globalData.product.product.price
       // })
-      let price = this.data.singlePrice * this.data.productNum - (this.data.coupon?this.data.coupon.activity.money:0)
+      let price
+      if (this.data.coupon) {
+        if (this.data.coupon.discount_type == 'pricebreak') {
+          price = this.data.singlePrice * this.data.productNum - this.data.coupon.activity.money
+       } else {
+        price =(this.data.singlePrice * this.data.productNum * this.data.coupon.activity.fold)/ 10
+       }
+      } else {
+        price = this.data.singlePrice * this.data.productNum
+      }
+      
       if (price >0) {
         this.setData({
           price:price/100
@@ -152,7 +164,17 @@ Page({
       }
       // console.log(this.data.singlePrice);
     }
-    let price = this.data.singlePrice * this.data.productNum - (this.data.coupon?this.data.coupon.activity.money:0)
+    // let price = this.data.singlePrice * this.data.productNum - (this.data.coupon?this.data.coupon.activity.money:0)
+    let price
+    if (this.data.coupon) {
+      if (this.data.coupon.discount_type == 'pricebreak') {
+        price = this.data.singlePrice * this.data.productNum - this.data.coupon.activity.money
+     } else {
+      price =(this.data.singlePrice * this.data.productNum * this.data.coupon.activity.fold)/ 10
+     }
+    } else {
+      price = this.data.singlePrice * this.data.productNum
+    }
     if (price >0) {
       this.setData({
         price:price/100
@@ -261,7 +283,17 @@ Page({
   },
   totalPrice(price) {
     let allPrice
-    allPrice = price * this.data.productNum - (this.data.coupon?this.data.coupon.activity.money:0)
+    if (this.data.coupon) {
+      if (this.data.coupon.discount_type == 'pricebreak') {
+        allPrice = this.data.singlePrice * this.data.productNum - this.data.coupon.activity.money
+     } else {
+      allPrice =(this.data.singlePrice * this.data.productNum * this.data.coupon.activity.fold)/ 10
+     }
+    } else {
+      allPrice = this.data.singlePrice * this.data.productNum
+    }
+      
+    // allPrice = price * this.data.productNum - (this.data.coupon?this.data.coupon.activity.money:0)
       if (allPrice >0) {
         this.setData({
           price:allPrice/100,
diff --git a/pages/order/scene/index.wxml b/pages/order/scene/index.wxml
index 2cef298..fcb59e6 100644
--- a/pages/order/scene/index.wxml
+++ b/pages/order/scene/index.wxml
@@ -70,7 +70,7 @@
     </view>
   </view>
 
-  <coupon  bind:getNewCoupon = 'getNewCoupon' wx:if="{{!kjId && !gp_id && type!='activity' && product && product.isGroup!=1 && isCar=='single' && type!='museum'}}" id="coupon"
+  <coupon  bind:getNewCoupon = 'getNewCoupon' wx:if="{{!kjId && !gp_id && type!='activity' && product && product.isGroup!=1 && isCar=='single' && type!='museum' && showYhq}}" id="coupon"
     money="{{singlePrice * productNum}}" sku="{{product.sku.id}}"></coupon>
 
   <!-- <view class="box" wx:if="{{type!='activity' && product && product.isGroup!=1}}">
diff --git a/pages/user/cartlist/list.js b/pages/user/cartlist/list.js
index 5c4dfc4..ad3dc1d 100644
--- a/pages/user/cartlist/list.js
+++ b/pages/user/cartlist/list.js
@@ -231,6 +231,7 @@ Page({
             product.push(item)
           }
       })
+      app.globalData.listName = 'car'
       if (product.length>1) {
         this.setData({
           showModel:true
diff --git a/pages/user/coupon/index.wxml b/pages/user/coupon/index.wxml
index bf54959..8eceacb 100644
--- a/pages/user/coupon/index.wxml
+++ b/pages/user/coupon/index.wxml
@@ -9,7 +9,14 @@
 <view class="coupon-item{{index==0?' active':''}}" wx:for="{{list}}" wx:for-index="i">
 	<view class="title-box">
 		<view class="title textOver">{{item.activity.name}}</view>
-		<view class="coupon-money">￥<text>{{item.activity.money/100}}</text></view>
+		<view class="coupon-money">
+      <view wx:if="{{item.activity.discount_type == 'pricebreak'}}">
+        ￥<text>{{item.activity.money/100}}</text>
+      </view>
+      <view wx:else>
+        <text>{{item.activity.fold}}折</text>
+      </view>
+    </view>
 	</view>
 	<view class="coupon-tip"><text>使用条件：</text>满{{item.activity.mini_money/100}}元</view>
 	<view class="coupon-tip"><text>有效期：</text>{{item.end_time}} 前使用</view>