调整附加费

public/js/order.js

@@ -584,6 +584,45 @@
 
 				});
 
+                // 查看物流轨迹
+                $('.view-shipping').click(function () {
+                    var order_id = $('#order_id').val();
+                    var user_id = $('#user_id').val();
+                    var type = $(this).data('type');
+
+                    $.ajax({
+                        url : '/ajax/shipping',
+                        type: 'post',
+                        data: {order_id : order_id, user_id : user_id, type : type},
+                        success: function(resp) { 
+                            if (resp.errcode == 0) {
+                                var data = resp.data;
+                                var content = '';
+
+                                if (data.constructor == Array) { // 判断返回结果是否为数组
+                                    for (var i = 0; i < data.length; i++) {
+                                        content += '<p><span style="margin-right:10px;">'+data[i]['AcceptTime']+'</span>'+data[i]['AcceptStation']+'<span></span></p>'
+                                    }  
+                                } else {
+                                    content = data;
+                                }
+
+                                layer.open({
+                                    title: '物流轨迹',
+                                    area: ['800px', '600px'],
+                                    content: content,
+                                    btn: [],
+                                })
+                            } else {
+                                layer.alert(resp.errmsg || '网络异常')
+                            }
+                        },
+                        error: function(err) {
+                            console.log(err);
+                        }
+                    })
+                })
+
 			},
 
             //物流信息
@@ -953,10 +992,10 @@
                 $('input[name=order_pay_type]').click(function(){
                     var val = $(this).val();
 
-                    if (val == 1) {
-                        $('.show-advance-pay').hide();
-                    } else {
+                    if (val == 2) {
                         $('.show-advance-pay').show();
+                    } else {
+                        $('.show-advance-pay').hide();
                     }
                 })
 

resources/views/detail/changeOrder.blade.php

@@ -108,7 +108,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">
@@ -119,8 +121,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>
@@ -166,7 +166,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>