Browse Source

返利金增加支付金额明细

xiaohaizhao 2 years ago
parent
commit
983d51c79d
2 changed files with 12 additions and 7 deletions
  1. 3 3
      packageA/orderForm/detail.js
  2. 9 4
      packageA/orderForm/detail.wxml

+ 3 - 3
packageA/orderForm/detail.js

@@ -412,7 +412,6 @@ Page({
         let rebatebalance = this.data.detail.rebatebalance; //返利金账户余额
         value = value > rebatebalance ? rebatebalance : value;
         let amount = this.data.detail.order_rebate_userate * this.data.detail.defaultamount; //最大可用金额
-
         _Http.basic({
             "id": 20230218225002,
             "content": {
@@ -425,7 +424,8 @@ Page({
             if (res.msg != '成功') {
                 wx.showToast({
                     title: res.msg,
-                    icon: "none"
+                    icon: "none",
+                    mask: true
                 });
                 this.setData({
                     "detail.accountclass.rebate_amount": this.data.detail.accountclass.rebate_amount
@@ -438,8 +438,8 @@ Page({
                     title: "返利金最大可使用" + amount + "元",
                     icon: "none"
                 })
+                this.getDetail(true, false)
             }
-            // this.getDetail(false, false)
         })
     },
     /* 删除订单 */

+ 9 - 4
packageA/orderForm/detail.wxml

@@ -70,10 +70,15 @@
 			<view class="label">是否使用返利金(余额:{{detail.rebatebalance}})</view>
 			<checkbox disabled="{{detail.status!='新建'}}" checked="{{detail.rebate_used==1}}" color='var(--assist)' />
 		</navigator>
-		<view class="row" wx:if="{{detail.rebate_used==1}}">
-			<view class="label">返利金支付(最多订单金额{{detail.order_rebate_userate}})</view>
-			<input disabled="{{detail.status!='新建'}}" bindtap="isEdit" type="digit" class="remarks" placeholder-class='placeholder' value="{{detail.rebateamount}}" placeholder="使用金额" bindblur="setRebate_amount" />
-		</view>
+		<block wx:if="{{detail.rebate_used==1}}">
+			<view class="row">
+				<view class="label">返利金支付(最多订单金额{{detail.order_rebate_userate}})</view>
+				<input disabled="{{detail.status!='新建'}}" bindtap="isEdit" type="digit" class="remarks" placeholder-class='placeholder' value="{{detail.rebateamount}}" placeholder="使用金额" bindblur="setRebate_amount" />
+			</view>
+			<view class="row">
+				<view class="label" style="font-size: 28rpx;">支付合计:{{detail.amount}}({{detail.accountclass.accountname}})+ {{detail.rebateamount}}(返利金)</view>
+			</view>
+		</block>
 	</block>
 </view>