diff --git a/packageC/pages/presell/cart/cart2_pre.js b/packageC/pages/presell/cart/cart2_pre.js index 95e1355..ec01b55 100644 --- a/packageC/pages/presell/cart/cart2_pre.js +++ b/packageC/pages/presell/cart/cart2_pre.js @@ -614,8 +614,8 @@ Page({ //--------------------提交订单----------------------- submitForm: function(t){ var th=this; - //如果商家不同意退定义 - if(!this.data.act.is_refundmoney && !th.agree_no_ref){ + //如果是部分定金,商家不同意退定金, + if(this.data.act.presell_type!=1 && !this.data.act.is_refundmoney && !th.agree_no_ref){ wx.showModal({ content: ' 预售商品不允许退定金!是否继续下单?', showCancel: true,//是否显示取消按钮 diff --git a/pages/user/order_list/order_list.wxml b/pages/user/order_list/order_list.wxml index f113c2a..81920ab 100644 --- a/pages/user/order_list/order_list.wxml +++ b/pages/user/order_list/order_list.wxml @@ -46,8 +46,9 @@ 尾款支付失败 - 待支付定金 + 待支付定金 待尾款 + 未支付