Merge branch 'zengjun'

resources/views/order/index/delivering.blade.php

@@ -133,7 +133,7 @@
                                     <span v-else>分箱 @{{ picktotraceidMap[order.orderno].length }} 件,展开单号</span>
                                 </button>
                             </div>
-                            <span v-else v-text="(order.carriername.includes('唯品顺丰')) ? order.code5 : order.soreference5"></span>
+                            <span v-else v-text="(order.carriername !==null && order.carriername.includes('唯品顺丰')) ? order.code5 : order.soreference5"></span>
                         </td>
                         <td class="text-muted text-wrap text-letter">
                             <div class="text-overflow-warp-200 warp-min-200"