Merge branch 'master' of http://git.huaml.com/zhh/huahuibao

app-ghs/controllers/OrderController.php

@@ -268,6 +268,8 @@ class OrderController extends BaseController
         $city = $get['city'] ?? '';
         $address = $get['address'] ?? '';
         $floor = $get['floor'] ?? '';
+        $customName = $get['customName']??'';
+        $customMobile = $get['customMobile']??'';
         $fullAddress = $province . $city . $address . $floor;
         $sendTime = $get['sendTime'] ?? '';
         $lat = $get['lat'] ?? '';
@@ -290,6 +292,8 @@ class OrderController extends BaseController
         $info = OrderClass::getOrderInfo($orderId);
         OrderClass::valid($info, $this->shopId);
         $expressAddInfo = [
+            'customName'=>$customName,
+            'customMobile'=>$customMobile,
             'province' => $province,
             'city' => $city,
             'address' => $address,