Merge branch 'zjl_self_express_20181030' into development

resources/views/detail/content.blade.php

@@ -182,7 +182,7 @@
                                     <a href="/changeShipping/{{$order_info['order_id']}}" class="btn btn-success btn-sm changeBtn">更改收货地址</a>
                                 @endif
                             @elseif (isset($_REQUEST['tags']) && $_REQUEST['tags'] == 'self')
-                                @if (in_array($order_info['status'], array(2, 4)) && in_array('self_order_update_address', $userPerms))
+                                @if (in_array($order_info['status'], array(1, 2, 4)) && in_array('self_order_update_address', $userPerms))
                                     <a href="/changeShipping/{{$order_info['order_id']}}?tags={{$_REQUEST['tags']}}" class="btn btn-success btn-sm changeBtn">更改收货地址</a>
                                 @endif
                             @elseif (isset($_REQUEST['tags']) && $_REQUEST['tags'] == 'erp')