From 56413e8d0b592f477d27b3a2f37fd8adb28b1196 Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Thu, 29 Aug 2024 12:42:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=BC=94=E8=89=BA=E7=A5=A8=E9=9D=9E=E5=AE=9E?=
 =?UTF-8?q?=E5=90=8D=E4=BC=98=E6=83=A0=E5=88=B8=E5=90=8E=E4=BB=B7=E6=A0=BC?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                     | 2 +-
 pages/order/scene/index.js | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app.js b/app.js
index dcb19b7..8daa8ad 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.isTest147? true : false;
+      data.isTest = data.isTest148? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index 0592d57..31de4f4 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -94,8 +94,8 @@ Page({
       // singlePrice: this.data.gp_id ? app.globalData.product.sku.event_price : app.globalData.product.sku.price
     })
     console.log(this.data.singlePrice);
-    this.showAllPrice()
     this.getNewCoupon()
+    // this.showAllPrice()
   //  console.log('********',this.data.product);
     if (!this.data.kjId && !this.data.gp_id && this.data.product.isGroup != 1 && this.data.type!='museum') {
       this.couponCom = this.selectAllComponents("#coupon")[0];
@@ -167,8 +167,8 @@ Page({
       // console.log(this.data.singlePrice);
     }else {
       let price
-    if (this.data.coupon) {
-      if (this.data.coupon.discount_type == 'pricebreak') {
+      if (this.data.coupon) {
+      if (this.data.coupon.activity.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