预售的订单优化

yvan.ni
1 parent 812d7096
Showing 2 changed files with 4 additions and 3 deletions
packageC/pages/presell/cart/cart2_pre.js
pages/user/order_list/order_list.wxml
@@ -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,//是否显示取消按钮
@@ -46,8 +46,9 @@
 					<text wx:if="{{item.presell.tail_pay_state==2}}">尾款支付失败</text>
 				</block>
 				<block wx:else>
-					<text wx:if="{{!item.presell.deposit_pay_time}}">待支付定金</text>
+					<text wx:if="{{item.presell.presell_type==0 &&  !item.presell.deposit_pay_time}}">待支付定金</text>
 					<text wx:if="{{item.presell.presell_type!=1 && item.presell.deposit_pay_time && !item.presell.tail_pay_state}}">待尾款</text>
+					<text wx:if="{{item.presell.presell_type==1 &&  item.order_status<2  && item.pay_status<1 }}">未支付</text>
 				</block>
  
 				<block wx:if="{{!(item.is_all_return_status==0 || item.is_all_return_status==1)}}">