Merge branch 'zjl_iteration_20200318'

public/js/refund.js

@@ -387,6 +387,7 @@
                 $('.return_num').keyup(function() {
                     var removal_number = parseInt($(this).parents('tr').find('.removal_number').val()); // 出库数量
                     var single_pre_price = parseFloat($(this).parents('tr').find('.single_pre_price').val()); // 均摊单价
+                    var pay_amount = $('.pay_amount').val();
                     var val = $(this).val(); // 退货数量
 
                     if (val > removal_number) {
@@ -409,6 +410,10 @@
 
                     return_total = return_total.toFixed(2);
 
+                    if (return_total > pay_amount) { // 如果四舍五入后的退款金额大于支付金额，则把支付金额赋值给退款金额
+                        return_total = pay_amount;
+                    }
+
                     $('.return_amount').val(return_total);
                     $('.return_amount_val').text(currency_sign + return_total);
                 })

resources/views/detail/return.blade.php

@@ -16,7 +16,7 @@
             <input type="hidden" name="return_info[mobile]" value="{{isset($user_info['mobile']) ? $user_info['mobile'] : $user_mobile}}">
             <input type="hidden" name="return_info[email]" value="{{isset($user_info['email']) ? $user_info['email'] : ''}}">
             <input type="hidden" name="return_info[company_name]" value="{{ isset($company_info['com_name']) ? $company_info['com_name'] : '' }}">
-            <input type="hidden" name="return_info[pay_amount]" value="{{ $order_info['order_amount'] + $order_price_info['pay_preferential'] }}">
+            <input type="hidden" class="pay_amount" name="return_info[pay_amount]" value="{{ $order_info['order_amount'] + $order_price_info['pay_preferential'] }}">
             <input type="hidden" name="pay_id" value="{{$order_pay_log[0]['pay_id']}}">
             
             <!-- 退货方式 -->