diff --git a/app.js b/app.js index c4dc4ce..6dce1b2 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.isTest158? true : false; + data.isTest = data.isTest159? true : false; data.indexSeason = null this.globalData.configJson = data }).then(() => { diff --git a/pages/order/postOrder/index.wxml b/pages/order/postOrder/index.wxml index 7b8cb56..582fcf4 100644 --- a/pages/order/postOrder/index.wxml +++ b/pages/order/postOrder/index.wxml @@ -1,6 +1,5 @@ - @@ -36,7 +35,7 @@ - + 购买须知:使用优惠券的组合订单均不支持部分退款 diff --git a/pages/order/scene/index.wxml b/pages/order/scene/index.wxml index 8cfeeb6..dbadf31 100644 --- a/pages/order/scene/index.wxml +++ b/pages/order/scene/index.wxml @@ -58,8 +58,8 @@ --> - - + + 购买须知:使用优惠券的组合订单均不支持部分退款 diff --git a/subPackages/feiyiNew/index.js b/subPackages/feiyiNew/index.js index f6a0d7b..12910fc 100644 --- a/subPackages/feiyiNew/index.js +++ b/subPackages/feiyiNew/index.js @@ -765,7 +765,8 @@ Page({ // flag:true // }) // this.getList() - app.globalData.isCartBuy = true; + app.globalData.isCartBuy = false; + app.globalData.listName = null }, /** diff --git a/subPackages/gwcOrder/index.wxml b/subPackages/gwcOrder/index.wxml index 77e5023..43b717d 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 33307ae..750c19b 100644 --- a/subPackages/postSearch/index.js +++ b/subPackages/postSearch/index.js @@ -594,7 +594,8 @@ openPopup() { }) this.getHeight() this.getCount() - app.globalData.isCartBuy = true; + app.globalData.isCartBuy = false; + app.globalData.listName = null }, /** diff --git a/subPackages/techanNew/index.js b/subPackages/techanNew/index.js index 7557f50..717122a 100644 --- a/subPackages/techanNew/index.js +++ b/subPackages/techanNew/index.js @@ -785,7 +785,8 @@ Page({ // debugger this.getCount() } - app.globalData.isCartBuy = true; + app.globalData.isCartBuy = false; + app.globalData.listName = null // debugger },