Merge branch 'master' into development

resources/views/refundlist/content.blade.php

@@ -41,6 +41,7 @@
                                         <select id="apply_status" name="apply_status" class="form-control apply_status selectpicker" title="全部" multiple>
                                         <select id="apply_status" name="apply_status" class="form-control apply_status selectpicker" title="全部" multiple>
                                             <option value="-1">已拒绝</option>
                                             <option value="-1">已拒绝</option>
                                             <option value="1">待处理</option>
                                             <option value="1">待处理</option>
+                                            <option value="5">已退款</option>
                                             <option value="10">已处理</option>
                                             <option value="10">已处理</option>
                                         </select>
                                         </select>
                                     </dd>
                                     </dd>
@@ -108,6 +109,7 @@
 									switch ($v['status']) {
 									switch ($v['status']) {
 										case -1: echo '<span class="list-text-cancel"><b>已拒绝</b></span>';break;
 										case -1: echo '<span class="list-text-cancel"><b>已拒绝</b></span>';break;
                                         case  1: echo '<span class="list-text-checking"><b>待处理</b></span>';break;
                                         case  1: echo '<span class="list-text-checking"><b>待处理</b></span>';break;
+										case  5: echo '<span class="list-text-checking"><b>已退款</b></span>';break;
 										case 10: echo '<span class="list-text-success"><b>已处理</b></span>';break;    
 										case 10: echo '<span class="list-text-success"><b>已处理</b></span>';break;    
 									}
 									}
 								?>
 								?>
@@ -120,7 +122,7 @@
 	                                <a class="btn btn-primary" href="/refund_details/{{$v['refund_id']}}" target="_blank">查看申请</a>
 	                                <a class="btn btn-primary" href="/refund_details/{{$v['refund_id']}}" target="_blank">查看申请</a>
 
 
                                     <!-- 退款申请已处理且为钱包支付 -->
                                     <!-- 退款申请已处理且为钱包支付 -->
-                                    @if ($v['status'] == 10 && strpos($pay_name, '钱包支付') !== false)
+                                    @if ($v['status'] == 1 && strpos($pay_name, '钱包支付') !== false)
                                         <!-- <a class="btn btn-info wallet-refund" data-oid="{{$v['order_id']}}" data-amount="{{number_format($v['pay_amount'] - $v['price_fall'], 2)}}" target="_blank">钱包退款</a> -->
                                         <!-- <a class="btn btn-info wallet-refund" data-oid="{{$v['order_id']}}" data-amount="{{number_format($v['pay_amount'] - $v['price_fall'], 2)}}" target="_blank">钱包退款</a> -->
                                         <a class="btn btn-info" href="/wallet_refund/{{$v['refund_id']}}" target="_blank">钱包退款</a>
                                         <a class="btn btn-info" href="/wallet_refund/{{$v['refund_id']}}" target="_blank">钱包退款</a>
                                     @endif
                                     @endif