sunhao 5 lat temu
rodzic
commit
213ca9f590

+ 1 - 1
app/Http/Controllers/Admin/OrderController.php

@@ -1807,7 +1807,7 @@ class OrderController extends Controller
1807 1807
                 $result[] = $status_arr[0];
1808 1808
                 break;
1809 1809
             case '2':
1810
-                $result[] = $status_arr[0];
1810
+                $result[] = $status_arr[1];
1811 1811
                 $result[] = $status_arr[3];
1812 1812
                 break;
1813 1813
             default:               

+ 6 - 3
resources/views/order/orderlist.blade.php

@@ -249,7 +249,7 @@
249 249
                                     @foreach($a['enable_status'] as $item)
250 250
                                         @if($item['status'] == 0 && $a['status'] == 1)
251 251
                                             <a id="verify_refuse" style="text-decoration:none" onClick='refuse_reason("{{$a['id']}}")' href="javascript:;" title="审核驳回"><span class="btn btn-danger radius">审核驳回</span></a>
252
-                                        @elseif($item['status'] == 0 && $a['status'] == 2 )
252
+                                        @elseif($item['status'] == 1 && $a['status'] == 2 )
253 253
                                             @if( ($self_role == '超级管理员' || $self_role =='售后管理员') && !$a['orderCode'])
254 254
                                             <a id="verify_refuse2" style="text-decoration:none" onClick='refuse_reason2("{{$a['id']}}")' href="javascript:;" title="反审"><span class="btn btn-danger radius">反审</span></a>
255 255
                                             @endif
@@ -300,7 +300,8 @@
300 300
                     <div class="modal-body" style="height:150px">
301 301
                         <div id="fa2">
302 302
                             <p style="font-size:14px">驳回/反审原因:</p>
303
-                            <input id='order_id' type='hidden' name='status' value=''/>
303
+                            <input id='order_id' type='hidden' name='order_id' value=''/>
304
+                            <input id='order_status' type='hidden' name='order_status' value=''/>
304 305
                             <textarea style="height:75px;" cols="85"  id='refuse_reason'></textarea>
305 306
                         </div>
306 307
          
@@ -808,19 +809,21 @@
808 809
         /*弹出层-填写原因*/
809 810
         function refuse_reason(id) {
810 811
             $("#order_id").val(id);
812
+            $("#order_status").val('0');
811 813
             $("#modal-demo1").modal("show");
812 814
         }
813 815
 
814 816
         /*弹出层-填写原因*/
815 817
         function refuse_reason2(id) {
816 818
             $("#order_id").val(id);
819
+            $("#order_status").val('1');
817 820
             $("#modal-demo1").modal("show");
818 821
         }
819 822
 
820 823
         function verify_refuse(){
821 824
             var reason = $("#refuse_reason").val();
822 825
             var id = $("#order_id").val();
823
-            var status = 0;
826
+            var status = $("#order_status").val();
824 827
             var admin_id = $('#admin_id').val();
825 828
             var stime = $('#stime').val();
826 829
             var etime = $('#etime').val();