Merge branch 'master' of http://119.23.72.7/zhujilai/Order into zjl_self_order_20180502

resources/views/detail/changeOrder.blade.php

@@ -70,7 +70,7 @@
                                 <input class="only_positive_nubme only_number num" name="change_info[{{$v['rec_id']}}][goods_number]" value="{{$v['goods_number']}}">
                                 <input class="only_positive_nubme only_number num" name="change_info[{{$v['rec_id']}}][goods_number]" value="{{$v['goods_number']}}">
                             </td>
                             </td>
                             <td>
                             <td>
-                                <input class="price only_number" name="change_info[{{$v['rec_id']}}][goods_price]" data-origin="{{$v['goods_price']}}" value="{{$v['goods_price']}}">
+                                <input class="price only_number" name="change_info[{{$v['rec_id']}}][goods_price]" data-origin="{{$v['original_price']}}" value="{{$v['goods_price']}}">
                             </td>
                             </td>
                         </tr>
                         </tr>
                     @endforeach
                     @endforeach

resources/views/detail/content.blade.php

@@ -526,7 +526,7 @@
                 @endif
                 @endif
                 
                 
                 <!-- 已发货之后的状态 -->
                 <!-- 已发货之后的状态 -->
-                @if ($order_info['status'] > 4)
+                @if ($order_info['status'] >= 4)
                     <a href="{{URL('invShipping', ['order_id'=>$order_info['order_id']])}}" class="btn btn-default">寄送发票</a>
                     <a href="{{URL('invShipping', ['order_id'=>$order_info['order_id']])}}" class="btn btn-default">寄送发票</a>
                 @endif
                 @endif
                
                
@@ -543,7 +543,7 @@
                 <a class="btn btn-default self_express" href="javascript:;" data-id="{{$order_info['order_id']}}" class="btn btn-default">填写快递单</a>
                 <a class="btn btn-default self_express" href="javascript:;" data-id="{{$order_info['order_id']}}" class="btn btn-default">填写快递单</a>
                 @endif
                 @endif
 
 
-                @if (in_array($order_info['status'], [4, 8]) && in_array('self_order_invoice_express', $userPerms))
+                @if ($order_info['status'] >= 4 && in_array('self_order_invoice_express', $userPerms))
                 <a class="btn btn-default self_invoice_express" data-id="{{$order_info['order_id']}}" href="javascript:;" class="btn btn-default">填写发票快递</a>
                 <a class="btn btn-default self_invoice_express" data-id="{{$order_info['order_id']}}" href="javascript:;" class="btn btn-default">填写发票快递</a>
                 @endif           
                 @endif           
             </div>
             </div>
@@ -596,7 +596,7 @@
                         @foreach ($actionLog as $v)
                         @foreach ($actionLog as $v)
                             <tr>
                             <tr>
                                 <td width="15%">{{date('Y-m-d H:i:s', $v->create_time)}}</td>
                                 <td width="15%">{{date('Y-m-d H:i:s', $v->create_time)}}</td>
-                                <td width="8%">{{App\Http\Controllers\getOperatorName($v->operator_id, $v->operator_type)}}</td>
+                                <td width="10%">{{App\Http\Controllers\getOperatorName($v->operator_id, $v->operator_type)}}</td>
                                 <td>{{$v->event}}</td>
                                 <td>{{$v->event}}</td>
                             </tr>
                             </tr>
                         @endforeach                   
                         @endforeach