Merge branch 'zjl_order_source_20180904' into development

resources/views/detail/changeOrder.blade.php

@@ -109,7 +109,9 @@
                 </tbody>
             </table>
             
-            @if ($order_temp_info['extend_fee_items'])
+            <?php $extend_fee_items = json_decode($order_temp_info['extend_fee_items'], true); ?>
+
+            @if ($extend_fee_items)
                 <hr/>
                 <p>附加费设置</p>
                 <table class="table table-bordered table-hover extend-fee-table">
@@ -120,8 +122,6 @@
                     </thead>
 
                     <tbody>
-                        <?php $extend_fee_items = json_decode($order_temp_info['extend_fee_items'], true); ?>
-
                         @foreach ($extend_fee_items as $k => $v) 
                             <tr data-sup="{{$k}}">
                                 <td>
@@ -167,7 +167,7 @@
                     <th width="20%">附加费金额</th>
                     <td>
                         <p class="text-danger">{{$currency}}<span class="extra_fee">{{$order_price_info['ext_price'] ? $order_price_info['ext_price'] : 0}}</span></p>
-                        <input type="hidden" name="extra_fee" autocomplete="off" value="{{$order_price_info['ext_price']}}">
+                        <input type="hidden" name="extra_fee" autocomplete="off" value="{{$order_price_info['ext_price'] ? $order_price_info['ext_price'] : 0}}">
                     </td>
                     <!-- <td><input type="text" name="extra_fee" autocomplete="off" value="{{$order_price_info['ext_price']}}" class="only_number"></td> -->
                 </tr>