diff --git a/app.js b/app.js
index ada7707..c4dc4ce 100644
--- a/app.js
+++ b/app.js
@@ -13,6 +13,7 @@ App({
this.updateApp()
this.globalData.appLaunchFlag = false
+ this.globalData.isCartBuy = false
},
onShow: function () {
diff --git a/pages/component/TitleHeader.js b/pages/component/TitleHeader.js
index 07c67a8..0c36fd2 100644
--- a/pages/component/TitleHeader.js
+++ b/pages/component/TitleHeader.js
@@ -97,6 +97,7 @@ Component({
console.log("清除购物车")
app.globalData.list = null;app.globalData.createDate = null;
app.globalData.index = 0;app.globalData.productPrice = 0;app.globalData.ticketPrice = 0;
+ app.globalData.isCartBuy = false
} catch(e) { console.log("清空购物车失败", e) }
wx.navigateTo({
url: '/pages/user/cartlist/list'
diff --git a/pages/index/index.js b/pages/index/index.js
index dd5bdeb..0814ac5 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -1069,6 +1069,7 @@ Page({
if (app.globalData.innerAudioContext) {
app.globalData.innerAudioContext.stop()
}
+ app.globalData.isCartBuy = false
},
goAIUrl () {
diff --git a/pages/map/index.js b/pages/map/index.js
index 31627d0..fa8e639 100644
--- a/pages/map/index.js
+++ b/pages/map/index.js
@@ -815,6 +815,7 @@ gotoUrls() {
util.pagePoint({
event:'mapshow_view'
},1)
+ app.globalData.isCartBuy = false
},
/**
diff --git a/pages/order/orderList/index.js b/pages/order/orderList/index.js
index 17844ef..eb09b25 100644
--- a/pages/order/orderList/index.js
+++ b/pages/order/orderList/index.js
@@ -248,6 +248,7 @@ Page({
app.globalData.index = 0
app.globalData.productPrice = 0
app.globalData.ticketPrice = 0
+ app.globalData.isCartBuy = false
} catch(e) {
console.log("清空购物车失败", e)
}
diff --git a/pages/order/orderList/index.wxml b/pages/order/orderList/index.wxml
index 785d25f..cee8f3e 100644
--- a/pages/order/orderList/index.wxml
+++ b/pages/order/orderList/index.wxml
@@ -1,5 +1,11 @@
+
+
+
+ 购买须知：使用优惠券的组合订单均不支持部分退款
+
+
diff --git a/pages/order/orderList/index.wxss b/pages/order/orderList/index.wxss
index 2d2b10d..cfe939d 100644
--- a/pages/order/orderList/index.wxss
+++ b/pages/order/orderList/index.wxss
@@ -173,4 +173,19 @@ color: #000000;
position: absolute;
top: 30rpx;
right: 30rpx;
- }
\ No newline at end of file
+ }
+ .warning-tip{
+ display: flex;
+ height: 67rpx;
+ background: #D62828;
+ align-items: center;
+ font-weight: bold;
+ font-size: 27rpx;
+ color: #FFFFFF;
+ padding-left: 13rpx;
+}
+.warning-tip image{
+ width: 26.67rpx;
+ height: 26.67rpx;
+ margin-right: 12rpx;
+}
\ No newline at end of file
diff --git a/pages/order/postOrder/index.wxml b/pages/order/postOrder/index.wxml
index 5bd8e1b..02baf62 100644
--- a/pages/order/postOrder/index.wxml
+++ b/pages/order/postOrder/index.wxml
@@ -36,6 +36,10 @@
+
+
+ 购买须知：使用优惠券的组合订单均不支持部分退款
+
diff --git a/pages/order/postOrder/index.wxss b/pages/order/postOrder/index.wxss
index f391cfc..5cb30b8 100644
--- a/pages/order/postOrder/index.wxss
+++ b/pages/order/postOrder/index.wxss
@@ -294,4 +294,21 @@ page {
font-weight: 500;
font-size: 23rpx;
color: #D62828;
+}
+
+.warning-tip{
+ display: flex;
+ height: 67rpx;
+ background: #D62828;
+ border-radius: 9rpx 9rpx 0rpx 0rpx;
+ align-items: center;
+ font-weight: bold;
+ font-size: 27rpx;
+ color: #FFFFFF;
+ padding-left: 13rpx;
+}
+.warning-tip image{
+ width: 26.67rpx;
+ height: 26.67rpx;
+ margin-right: 12rpx;
}
\ No newline at end of file
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index b460fb6..cb9ceef 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -28,7 +28,7 @@ Page({
allowance_price: 0,
pIndex: 0,
flag:null,
- ticket_type:1,
+ ticket_type:1,
isCar:'single',
showMask: false,
price:0,
@@ -52,6 +52,8 @@ Page({
selectExplain: false,
explainData: null,
showContent: false,
+
+ isCartBuy: false,
},
/**
@@ -73,7 +75,8 @@ Page({
is_real_name:app.globalData.product.sku.sku_model.is_real_name,
date: app.globalData.product.date,
time: app.globalData.product.time || {},
- showYhq:app.globalData.listName?false:true
+ showYhq:app.globalData.listName?false:true,
+ isCartBuy:app.globalData.isCartBuy,
})
console.log('-------',this.data.product,this.data.time, app.globalData);
// debugger
diff --git a/pages/order/scene/index.wxml b/pages/order/scene/index.wxml
index e0d01d4..e3b855d 100644
--- a/pages/order/scene/index.wxml
+++ b/pages/order/scene/index.wxml
@@ -57,7 +57,14 @@
{{item}}
-->
-
+
+
+
+
+ 购买须知：使用优惠券的组合订单均不支持部分退款
+
+
+
diff --git a/pages/order/scene/index.wxss b/pages/order/scene/index.wxss
index 36c3e24..05c01c3 100644
--- a/pages/order/scene/index.wxss
+++ b/pages/order/scene/index.wxss
@@ -509,4 +509,25 @@ color: #000000;
.icon-gou1{
color: #D62828;
font-size: 33rpx;
+}
+.warning-tip{
+ display: flex;
+ height: 67rpx;
+ background: #D62828;
+ border-radius: 9rpx 9rpx 0rpx 0rpx;
+ align-items: center;
+ font-weight: bold;
+ font-size: 27rpx;
+ color: #FFFFFF;
+ padding-left: 13rpx;
+ margin: 0 25rpx;
+}
+.warning-tip image{
+ width: 26.67rpx;
+ height: 26.67rpx;
+ margin-right: 12rpx;
+}
+.warning-container .box{
+ margin-top: 0;
+ border-radius: 0 0 9rpx 9rpx;
}
\ No newline at end of file
diff --git a/pages/pbService/aiHelpYou/index.js b/pages/pbService/aiHelpYou/index.js
index 7d6e0ae..885e909 100644
--- a/pages/pbService/aiHelpYou/index.js
+++ b/pages/pbService/aiHelpYou/index.js
@@ -84,7 +84,7 @@ Page({
* 生命周期函数--监听页面显示
*/
onShow: function () {
-
+ app.globalData.isCartBuy = false
},
/**
diff --git a/pages/user/cartlist/list.js b/pages/user/cartlist/list.js
index 4317760..62a9583 100644
--- a/pages/user/cartlist/list.js
+++ b/pages/user/cartlist/list.js
@@ -266,6 +266,10 @@ Page({
}
app.globalData.postProduct = product;
+
+ // 是否从购物车下单
+ app.globalData.isCartBuy = true;
+
if (app.globalData.list) {
app.globalData.product = app.globalData.list[app.globalData.index]
}
@@ -442,7 +446,9 @@ Page({
app.globalData.productPrice = 0
app.globalData.ticketPrice = 0
app.globalData.product = null
+ app.globalData.isCartBuy = false
this.data.productType = ''
+ app.globalData.isCartBuy = false
console.log(app.globalData)
},
diff --git a/pages/user/order/list.js b/pages/user/order/list.js
index 573bb1c..ff88633 100644
--- a/pages/user/order/list.js
+++ b/pages/user/order/list.js
@@ -261,6 +261,7 @@ Page({
list:[]
})
this.getList()
+ app.globalData.isCartBuy = false
},
/**
diff --git a/pages/user/user.js b/pages/user/user.js
index 2986d71..1bbe1d2 100644
--- a/pages/user/user.js
+++ b/pages/user/user.js
@@ -89,6 +89,7 @@ Page({
event:'mine_view'
},1)
this.getList()
+ app.globalData.isCartBuy = false
},
pagePoint: function(e){
util.pagePoint(e)
diff --git a/subPackages/gwcOrder/index.js b/subPackages/gwcOrder/index.js
index 5f410db..17216f0 100644
--- a/subPackages/gwcOrder/index.js
+++ b/subPackages/gwcOrder/index.js
@@ -39,6 +39,8 @@ Page({
status:false,
skuDays: 30,
+
+ isCartBuy: false,
},
/**
@@ -59,6 +61,8 @@ Page({
is_need_idcard:app.globalData.product.sku.sku_model.is_need_idcard,
is_authentication:app.globalData.product.sku.sku_model.is_authentication || 0,
is_real_name:app.globalData.product.sku.sku_model.is_real_name,
+ isCartBuy:app.globalData.isCartBuy,
+
})
console.log('-------',app.globalData.product.sku.sku_model.is_need_idcard);
console.log('---是否实名----',app.globalData.product.sku.sku_model.is_authentication);
diff --git a/subPackages/gwcOrder/index.wxml b/subPackages/gwcOrder/index.wxml
index 6d08452..43b717d 100644
--- a/subPackages/gwcOrder/index.wxml
+++ b/subPackages/gwcOrder/index.wxml
@@ -21,8 +21,17 @@
-
+
+
+
+
+ 购买须知：使用优惠券的组合订单均不支持部分退款
+
+
+
+
+
diff --git a/subPackages/gwcOrder/index.wxss b/subPackages/gwcOrder/index.wxss
index 04cb740..f44ddc7 100644
--- a/subPackages/gwcOrder/index.wxss
+++ b/subPackages/gwcOrder/index.wxss
@@ -373,4 +373,25 @@ page {
color: white;
font-size: 36rpx;
background: #D62828;
- }
\ No newline at end of file
+ }
+ .warning-tip{
+ display: flex;
+ height: 67rpx;
+ background: #D62828;
+ border-radius: 9rpx 9rpx 0rpx 0rpx;
+ align-items: center;
+ font-weight: bold;
+ font-size: 27rpx;
+ color: #FFFFFF;
+ padding-left: 13rpx;
+ margin: 0 25rpx;
+}
+.warning-tip image{
+ width: 26.67rpx;
+ height: 26.67rpx;
+ margin-right: 12rpx;
+}
+.warning-container .box{
+ margin-top: 0;
+ border-radius: 0 0 9rpx 9rpx;
+}
\ No newline at end of file
diff --git a/subPackages/techanCart/index.js b/subPackages/techanCart/index.js
index 203f68d..8672d1e 100644
--- a/subPackages/techanCart/index.js
+++ b/subPackages/techanCart/index.js
@@ -372,6 +372,7 @@ Page({
app.globalData.productPrice = 0
app.globalData.ticketPrice = 0
this.data.productType = ''
+ app.globalData.isCartBuy = false
},
/**
diff --git a/utils/https.js b/utils/https.js
index d55ab84..435b522 100644
--- a/utils/https.js
+++ b/utils/https.js
@@ -232,6 +232,7 @@ function user_post_new(url, data = {}, type) {
let app = getApp()
app.globalData.list = null;app.globalData.createDate = null;
app.globalData.index = 0;app.globalData.productPrice = 0;app.globalData.ticketPrice = 0;
+ app.globalData.isCartBuy = false
} catch(e) { console.log("清空购物车失败", e) }
if (res.data.data.pay_status == 1) {