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 @@
-
+
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 @@
-
+
购买须知:使用优惠券的组合订单均不支持部分退款
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 @@
-->
-
-
+
+
购买须知:使用优惠券的组合订单均不支持部分退款
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 @@
-
-
+
+
购买须知:使用优惠券的组合订单均不支持部分退款
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
},