jiazhipeng 4 months ago
parent
commit
2421f96c5c
  1. 2
      app.js
  2. 3
      pages/order/postOrder/index.wxml
  3. 4
      pages/order/scene/index.wxml
  4. 3
      subPackages/feiyiNew/index.js
  5. 4
      subPackages/gwcOrder/index.wxml
  6. 3
      subPackages/postSearch/index.js
  7. 3
      subPackages/techanNew/index.js

2
app.js

@ -39,7 +39,7 @@ App({
// 获取前端配置文件 // 获取前端配置文件
commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => { commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
let data = JSON.parse(res.data); let data = JSON.parse(res.data);
data.isTest = data.isTest158? true : false; data.isTest = data.isTest159? true : false;
data.indexSeason = null data.indexSeason = null
this.globalData.configJson = data this.globalData.configJson = data
}).then(() => { }).then(() => {

3
pages/order/postOrder/index.wxml

@ -1,6 +1,5 @@
<!--pages/order/post/index.wxml--> <!--pages/order/post/index.wxml-->
<title title="订单填写"></title> <title title="订单填写"></title>
<view class="box topbox" wx:for="{{product}}" wx:key="index"> <view class="box topbox" wx:for="{{product}}" wx:key="index">
<!-- 选择配送方式 --> <!-- 选择配送方式 -->
<view class="sendwayArea" wx:if="{{from!='cart'}}"> <view class="sendwayArea" wx:if="{{from!='cart'}}">
@ -36,7 +35,7 @@
</view> </view>
<view class="sku-info-container"> <view class="sku-info-container">
<view class="warning-tip" wx:if="{{flag=='mix'||(from=='cart'&&coupon)}}"> <view class="warning-tip" wx:if="{{flag=='mix'||(from=='cart'&&coupon&&product.length>1)}}">
<image src="https://static.ticket.sz-trip.com/uploads/20251210/9cad73fff1eaf21f66aa34da4951b2fb.png"></image> <image src="https://static.ticket.sz-trip.com/uploads/20251210/9cad73fff1eaf21f66aa34da4951b2fb.png"></image>
购买须知:使用优惠券的组合订单均不支持部分退款 购买须知:使用优惠券的组合订单均不支持部分退款
</view> </view>

4
pages/order/scene/index.wxml

@ -58,8 +58,8 @@
</view> --> </view> -->
</view> </view>
<view class="{{flag=='mix'||(isCartBuy&&coupon)?'warning-container':''}}"> <view class="{{flag=='mix'?'warning-container':''}}">
<view class="warning-tip" wx:if="{{flag=='mix'||(isCartBuy&&coupon)}}"> <view class="warning-tip" wx:if="{{flag=='mix'}}">
<image src="https://static.ticket.sz-trip.com/uploads/20251210/9cad73fff1eaf21f66aa34da4951b2fb.png"></image> <image src="https://static.ticket.sz-trip.com/uploads/20251210/9cad73fff1eaf21f66aa34da4951b2fb.png"></image>
购买须知:使用优惠券的组合订单均不支持部分退款 购买须知:使用优惠券的组合订单均不支持部分退款
</view> </view>

3
subPackages/feiyiNew/index.js

@ -765,7 +765,8 @@ Page({
// flag:true // flag:true
// }) // })
// this.getList() // this.getList()
app.globalData.isCartBuy = true; app.globalData.isCartBuy = false;
app.globalData.listName = null
}, },
/** /**

4
subPackages/gwcOrder/index.wxml

@ -22,8 +22,8 @@
</view> </view>
</view> </view>
<view class="{{isCartBuy&&coupon?'warning-container':''}}"> <view class="{{isCartBuy?'warning-container':''}}">
<view class="warning-tip" wx:if="{{isCartBuy&&coupon}}"> <view class="warning-tip" wx:if="{{isCartBuy}}">
<image src="https://static.ticket.sz-trip.com/uploads/20251210/9cad73fff1eaf21f66aa34da4951b2fb.png"></image> <image src="https://static.ticket.sz-trip.com/uploads/20251210/9cad73fff1eaf21f66aa34da4951b2fb.png"></image>
购买须知:使用优惠券的组合订单均不支持部分退款 购买须知:使用优惠券的组合订单均不支持部分退款
</view> </view>

3
subPackages/postSearch/index.js

@ -594,7 +594,8 @@ openPopup() {
}) })
this.getHeight() this.getHeight()
this.getCount() this.getCount()
app.globalData.isCartBuy = true; app.globalData.isCartBuy = false;
app.globalData.listName = null
}, },
/** /**

3
subPackages/techanNew/index.js

@ -785,7 +785,8 @@ Page({
// debugger // debugger
this.getCount() this.getCount()
} }
app.globalData.isCartBuy = true; app.globalData.isCartBuy = false;
app.globalData.listName = null
// debugger // debugger
}, },

Loading…
Cancel
Save