Commit 6b34f26b0943cdb0a2f9bd2f49ef0e4c7c70e7c0
1 parent
48cc32ee
1、购物车的切换的优化
2、预售在显示尾款到期时间的优化
Showing
3 changed files
with
5 additions
and
4 deletions
packageC/pages/presell/cart/cart.js
| @@ -2489,7 +2489,7 @@ Page({ | @@ -2489,7 +2489,7 @@ Page({ | ||
| 2489 | getApp().my_warnning("支付成功", 1, th); | 2489 | getApp().my_warnning("支付成功", 1, th); |
| 2490 | var send_time = th.data.pre_arr.delivery_date; | 2490 | var send_time = th.data.pre_arr.delivery_date; |
| 2491 | if (th.data.pre_arr.delivery_type == 2) { | 2491 | if (th.data.pre_arr.delivery_type == 2) { |
| 2492 | - send_time = th.data.pre_arr.delivery_daynum * 3600; | 2492 | + send_time = ut.gettimestamp() +th.data.pre_arr.delivery_daynum * 3600*24; |
| 2493 | } | 2493 | } |
| 2494 | th.setData({ isclose: 0, 'order.order_status': 1, 'order.pay_status': 1, 'wait_wk': 0, 'presell.tail_pay_state': 1, 'wait_fh': 1, send_time: send_time }); | 2494 | th.setData({ isclose: 0, 'order.order_status': 1, 'order.pay_status': 1, 'wait_wk': 0, 'presell.tail_pay_state': 1, 'wait_fh': 1, send_time: send_time }); |
| 2495 | th.data.paying=0; | 2495 | th.data.paying=0; |
| @@ -2522,7 +2522,7 @@ Page({ | @@ -2522,7 +2522,7 @@ Page({ | ||
| 2522 | if (t.data.code == 0) { | 2522 | if (t.data.code == 0) { |
| 2523 | var send_time = th.data.pre_arr.delivery_date; | 2523 | var send_time = th.data.pre_arr.delivery_date; |
| 2524 | if (th.data.pre_arr.delivery_type == 2) { | 2524 | if (th.data.pre_arr.delivery_type == 2) { |
| 2525 | - send_time = th.data.pre_arr.delivery_daynum * 3600; | 2525 | + send_time = ut.gettimestamp() +th.data.pre_arr.delivery_daynum * 3600*24; |
| 2526 | } | 2526 | } |
| 2527 | //---用余额支付--- | 2527 | //---用余额支付--- |
| 2528 | getApp().my_warnning("支付成功", 1, th); | 2528 | getApp().my_warnning("支付成功", 1, th); |
packageC/pages/presell/cart/cart.wxml
| @@ -329,9 +329,9 @@ | @@ -329,9 +329,9 @@ | ||
| 329 | </block> | 329 | </block> |
| 330 | 330 | ||
| 331 | <block else> | 331 | <block else> |
| 332 | - <view class="item" wx:if="{{order.shipping_status>0}}"> | 332 | + <view class="item" wx:if="{{order.shipping_price>0}}"> |
| 333 | <view>配送费用</view> | 333 | <view>配送费用</view> |
| 334 | - <view class="co-red">￥ {{filters.toFix(order.shipping_status,2)}}元</view> | 334 | + <view class="co-red">￥ {{filters.toFix(order.shipping_price,2)}}元</view> |
| 335 | </view> | 335 | </view> |
| 336 | 336 | ||
| 337 | <view class="item" wx:if="{{order.coupon_price>0}}"> | 337 | <view class="item" wx:if="{{order.coupon_price>0}}"> |
packageE/pages/cart/cart2/cart2.js
| @@ -4106,6 +4106,7 @@ Page({ | @@ -4106,6 +4106,7 @@ Page({ | ||
| 4106 | th.data.is_summit_ing = 0; | 4106 | th.data.is_summit_ing = 0; |
| 4107 | ff = false; | 4107 | ff = false; |
| 4108 | getApp().confirmBox("请新建收货地址"); | 4108 | getApp().confirmBox("请新建收货地址"); |
| 4109 | + th.setData({submit: 0}) | ||
| 4109 | } | 4110 | } |
| 4110 | if (!ff) return false; | 4111 | if (!ff) return false; |
| 4111 | 4112 |