Merge branch 'zjl_change_addr_20200410'

app/Http/Controllers/OrderController.php

@@ -1370,14 +1370,9 @@ Class OrderController extends Controller
 
 
             $update_url = Config('website.api_domain').'order/updateOrderAddress';
             $update_url = Config('website.api_domain').'order/updateOrderAddress';
 
 
-            $update = json_decode(curlApi($update_url, $data, 'POST'), true);
+            $res = json_decode(curlApi($update_url, $data, 'POST'), true);
 
 
-            if ($update['err_code'] == 0) {
-                return array('errcode'=>0,'errmsg'=>'操作成功');
-            } else {
-                errorLog(Error::E_UPDATE_FAILED, '操作失败');
-                return array('errcode'=>-1,'errmsg'=>'操作失败');
-            }
+            return ['errcode' => $res['err_code'], 'errmsg' => $res['err_msg']];
         }
         }
 
 
         $info = $this->orderDetail($request, $id);
         $info = $this->orderDetail($request, $id);

public/js/order.js

@@ -1302,7 +1302,7 @@
 				});
 				});
 			},
 			},
 
 
-            //物流信息
+            //发票信息
             changeInvoice:function() {
             changeInvoice:function() {
                 var order_id = $('input[name=order_id]').val();
                 var order_id = $('input[name=order_id]').val();