Merge branch 'zjl_iteration_20181127' into development

resources/views/detail/content.blade.php

@@ -637,7 +637,7 @@
             </div>
             </div>
 
 
             <!-- 快递公司 -->
             <!-- 快递公司 -->
-            @if ($shippings) 
+            @if (isset($shippings)) 
                 <script>
                 <script>
                     var shippings = '{!! json_encode($shippings) !!}';
                     var shippings = '{!! json_encode($shippings) !!}';