Merge branch 'dev/ver/1.0.0' of http://git.ichunt.net/semour/semour_web into dev/ver/1.0.0

app/Http/Services/UserAddressService.php

@@ -16,13 +16,16 @@ class UserAddressService
                 $address['email'] = $user->email;
                 $address['phone'] = $user->phone;
             }
+            if (empty($address['company_name'])) {
+                $address['company_name'] = '';
+            }
             $address['user_id'] = $user->id;
             $address['create_time'] = time();
             //如果没有默认地址,那么就设置为默认地址
             $hasDefaultAddress = UserAddressModel::where('user_id', $user->id)->where('is_default', 1)->exists();
             if (!$hasDefaultAddress) {
                 $address['is_default'] = 1;
-            }else{
+            } else {
                 $address['is_default'] = 0;
             }
             return UserAddressModel::insertGetId($address);
@@ -32,6 +35,9 @@ class UserAddressService
     public static function updateUserAddress($address, $user)
     {
         return DB::transaction(function () use ($address, $user) {
+            if (empty($address['company_name'])) {
+                $address['company_name'] = '';
+            }
             if ($address['is_default']) {
                 UserAddressModel::where('user_id', $user->id)->update(['is_default' => 0]);
             }