From b1a7bbe34c8bdc3ae200923e2ce9269ce7980445 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 11 Dec 2025 13:12:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E5=8D=95=E6=8F=90=E6=96=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                           | 2 +-
 pages/order/orderList/index.wxml | 4 ++--
 pages/order/postOrder/index.wxml | 2 +-
 pages/order/scene/index.wxml     | 4 ++--
 pages/user/cartlist/list.js      | 2 +-
 subPackages/feiyiNew/index.js    | 3 +++
 subPackages/gwcOrder/index.wxml  | 4 ++--
 subPackages/postSearch/index.js  | 3 +++
 subPackages/techanCart/index.js  | 2 ++
 subPackages/techanNew/index.js   | 3 +++
 10 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/app.js b/app.js
index 6dce1b2..c4dc4ce 100644
--- a/app.js
+++ b/app.js
@@ -39,7 +39,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest159? true : false;
+            data.isTest = data.isTest158? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {
diff --git a/pages/order/orderList/index.wxml b/pages/order/orderList/index.wxml
index 4da2ce1..85f9a82 100644
--- a/pages/order/orderList/index.wxml
+++ b/pages/order/orderList/index.wxml
@@ -1,10 +1,10 @@
 <wxs src="../../../utils/filter.wxs" module="tool" />
 <title title="订单列表"></title>
 
-<!-- <view class="warning-tip" >
+<view class="warning-tip" wx:if="{{coupon}}">
     <image src="https://static.ticket.sz-trip.com/uploads/20251210/9cad73fff1eaf21f66aa34da4951b2fb.png"></image>
     购买须知：使用优惠券的组合订单均不支持部分退款
-</view> -->
+</view>
 
 <!-- 邮寄 -->
 <view class="box" wx:if="{{postList.length != 0}}">
diff --git a/pages/order/postOrder/index.wxml b/pages/order/postOrder/index.wxml
index 8862eb3..7b8cb56 100644
--- a/pages/order/postOrder/index.wxml
+++ b/pages/order/postOrder/index.wxml
@@ -36,7 +36,7 @@
     </view>
 
     <view class="sku-info-container">
-        <view class="warning-tip" wx:if="{{false}}">
+        <view class="warning-tip" wx:if="{{flag=='mix'||(from=='cart'&&coupon)}}">
             <image src="https://static.ticket.sz-trip.com/uploads/20251210/9cad73fff1eaf21f66aa34da4951b2fb.png"></image>
             购买须知：使用优惠券的组合订单均不支持部分退款
         </view>
diff --git a/pages/order/scene/index.wxml b/pages/order/scene/index.wxml
index dee95c0..8cfeeb6 100644
--- a/pages/order/scene/index.wxml
+++ b/pages/order/scene/index.wxml
@@ -58,8 +58,8 @@
     </view> -->
   </view>
 
-  <view class="{{isCartBuy&&coupon?'warning-container':''}}">
-    <view class="warning-tip" wx:if="{{isCartBuy&&coupon}}">
+  <view class="{{flag=='mix'||(isCartBuy&&coupon)?'warning-container':''}}">
+    <view class="warning-tip" wx:if="{{flag=='mix'||(isCartBuy&&coupon)}}">
         <image src="https://static.ticket.sz-trip.com/uploads/20251210/9cad73fff1eaf21f66aa34da4951b2fb.png"></image>
         购买须知：使用优惠券的组合订单均不支持部分退款
     </view>
diff --git a/pages/user/cartlist/list.js b/pages/user/cartlist/list.js
index 73d672e..62a9583 100644
--- a/pages/user/cartlist/list.js
+++ b/pages/user/cartlist/list.js
@@ -268,7 +268,7 @@ Page({
                 app.globalData.postProduct = product;
 
                 // 是否从购物车下单
-                // app.globalData.isCartBuy = true;
+                app.globalData.isCartBuy = true;
 
                 if (app.globalData.list) {
                     app.globalData.product = app.globalData.list[app.globalData.index]
diff --git a/subPackages/feiyiNew/index.js b/subPackages/feiyiNew/index.js
index eb5bb0d..f6a0d7b 100644
--- a/subPackages/feiyiNew/index.js
+++ b/subPackages/feiyiNew/index.js
@@ -311,6 +311,8 @@ Page({
             })
             console.log(product1);
             app.globalData.postProduct = product;
+            // 是否从购物车下单
+            app.globalData.isCartBuy = true;
             if (app.globalData.list) {
                 app.globalData.product = app.globalData.list[app.globalData.index]
             }
@@ -763,6 +765,7 @@ Page({
     //   flag:true
     // })
     // this.getList()
+    app.globalData.isCartBuy = true;
   },
 
   /**
diff --git a/subPackages/gwcOrder/index.wxml b/subPackages/gwcOrder/index.wxml
index 43b717d..77e5023 100644
--- a/subPackages/gwcOrder/index.wxml
+++ b/subPackages/gwcOrder/index.wxml
@@ -22,8 +22,8 @@
     </view>
   </view>
 
-  <view class="{{isCartBuy?'warning-container':''}}">
-    <view class="warning-tip" wx:if="{{isCartBuy}}">
+  <view class="{{isCartBuy&&coupon?'warning-container':''}}">
+    <view class="warning-tip" wx:if="{{isCartBuy&&coupon}}">
         <image src="https://static.ticket.sz-trip.com/uploads/20251210/9cad73fff1eaf21f66aa34da4951b2fb.png"></image>
         购买须知：使用优惠券的组合订单均不支持部分退款
     </view>
diff --git a/subPackages/postSearch/index.js b/subPackages/postSearch/index.js
index 0ca1297..33307ae 100644
--- a/subPackages/postSearch/index.js
+++ b/subPackages/postSearch/index.js
@@ -246,6 +246,8 @@ Page({
             })
           console.log(product1);
           app.globalData.postProduct = product;
+          // 是否从购物车下单
+          app.globalData.isCartBuy = true;
           if (app.globalData.list) {
               app.globalData.product = app.globalData.list[app.globalData.index]
           }
@@ -592,6 +594,7 @@ openPopup() {
     })
     this.getHeight()
     this.getCount()
+    app.globalData.isCartBuy = true;
   },
 
   /**
diff --git a/subPackages/techanCart/index.js b/subPackages/techanCart/index.js
index 8672d1e..dade9f1 100644
--- a/subPackages/techanCart/index.js
+++ b/subPackages/techanCart/index.js
@@ -209,6 +209,8 @@ Page({
                 if (app.globalData.list) {
                     app.globalData.product = app.globalData.list[app.globalData.index]
                 }
+                // 是否从购物车下单
+                app.globalData.isCartBuy = true;
                 if (this.data.productType == 'post') {
                     console.log(this.data.flag);
                     wx.navigateTo({
diff --git a/subPackages/techanNew/index.js b/subPackages/techanNew/index.js
index ffa6c76..7557f50 100644
--- a/subPackages/techanNew/index.js
+++ b/subPackages/techanNew/index.js
@@ -325,6 +325,8 @@ Page({
             if (app.globalData.list) {
                 app.globalData.product = app.globalData.list[app.globalData.index]
             }
+            // 是否从购物车下单
+            app.globalData.isCartBuy = true;
             wx.navigateTo({
               url: '/pages/order/postOrder/index?from=cart&flag=' + this.data.flag,
           })
@@ -783,6 +785,7 @@ Page({
       // debugger
       this.getCount()
     }
+    app.globalData.isCartBuy = true;
     // debugger
   },