Merge branch 'master' into development

app/Http/Controllers/AddOrderController.php

@@ -209,13 +209,11 @@ Class AddOrderController extends Controller
         $address = DB::connection('order')->table('lie_user_address')->where(['user_id' => $info['internal_uid'], 'is_default' => 1])->first();
         
         $address->province_val = $this->getAddress($address->province);
-        $address->city_val = $this->getAddress($address->city);
-        $address->district_val = $this->getAddress($address->district);
-        
+        $address->city_val     = $this->getAddress($address->city);
+        $address->district_val = $this->getAddress($address->district); 
+             
         $info['address'] = $address;
-
-        $sale_id = $request->user->userId;
-        $info['sale_id'] = $sale_id;
+        $info['sale_id'] = $request->user->userId;
 
         // 当前登录用户名称
         $userInfo = DB::table('user_info')->where('userId', $sale_id)->select('name')->first(); 
@@ -228,6 +226,8 @@ Class AddOrderController extends Controller
             $user = DB::connection('order')->table('lie_user_main')->where('user_id', $intracode->user_id)->select('mobile')->first();
 
             $info['mobile'] = $user ? $user->mobile : '';
+        } else {
+            $info['mobile'] = '';
         }
 
         return view('addOffline', $info);