用户地址优化

application/service/UserAddressService.php

@@ -354,21 +354,37 @@ class UserAddressService
             'city'              => intval($params['city']),
             'county'            => isset($params['county']) ? intval($params['county']) : 0,
             'address'           => $params['address'],
-            'idcard_name'       => empty($params['idcard_name']) ? '' : $params['idcard_name'],
-            'idcard_number'     => empty($params['idcard_number']) ? '' : $params['idcard_number'],
-            'idcard_front'      => $attachment['data']['idcard_front'],
-            'idcard_back'       => $attachment['data']['idcard_back'],
             'is_default'        => $is_default,
         ];
-        if(!empty($params['lng']))
+
+        // 坐标
+        if(!empty($params['lng']) && $params['lng'] != 0)
         {
             $data['lng'] = floatval($params['lng']);
         }
-        if(!empty($params['lat']))
+        if(!empty($params['lat']) && $params['lat'] != 0)
         {
             $data['lat'] = floatval($params['lat']);
         }
 
+        // 身份证信息
+        if(!empty($params['idcard_name']))
+        {
+            $data['idcard_name'] = $params['idcard_name'];
+        }
+        if(!empty($params['idcard_number']))
+        {
+            $data['idcard_number'] = $params['idcard_number'];
+        }
+        if(!empty($attachment['data']['idcard_front']))
+        {
+            $data['idcard_front'] = $attachment['data']['idcard_front'];
+        }
+        if(!empty($attachment['data']['idcard_back']))
+        {
+            $data['idcard_back'] = $attachment['data']['idcard_back'];
+        }
+
         // 用户地址保存前钩子
         $hook_name = 'plugins_service_user_address_save_begin';
         $ret = HookReturnHandle(Hook::listen($hook_name, [

sourcecode/alipay/default/pages/user-address-save/user-address-save.js

@@ -449,13 +449,15 @@ Page({
     // 是否开启了用户身份证信息
     if(self.data.home_user_address_idcard_status == 1)
     {
+      // 验证
       validation.push({ fields: "idcard_name", msg: "请填写身份证姓名" });
       validation.push({ fields: "idcard_number", msg: "请填写身份证号码" });
       validation.push({ fields: "idcard_front", msg: "请上传身份证正面照片" });
       validation.push({ fields: "idcard_back", msg: "请上传身份证背面照片" });
-    } else {
-      form_data['idcard_name'] = self.data.address_data.idcard_name || '';
-      form_data['idcard_number'] = self.data.address_data.idcard_number || '';
+
+      // 数据
+      form_data['idcard_front'] = self.data.idcard_images_data.idcard_front || '';
+      form_data['idcard_back'] = self.data.idcard_images_data.idcard_back || '';
     }
 
     form_data['province'] = self.data.province_id;
@@ -463,8 +465,6 @@ Page({
     form_data['county'] = self.data.county_id;
     form_data['id'] = self.data.params.id || 0;
     form_data['is_default'] = form_data.is_default == true ? 1 : 0;
-    form_data['idcard_front'] = self.data.idcard_images_data.idcard_front || '';
-    form_data['idcard_back'] = self.data.idcard_images_data.idcard_back || '';
 
     // 地理位置
     var lng = 0;

sourcecode/baidu/default/pages/user-address-save/user-address-save.js

@@ -448,13 +448,15 @@ Page({
     // 是否开启了用户身份证信息
     if(self.data.home_user_address_idcard_status == 1)
     {
+      // 验证
       validation.push({ fields: "idcard_name", msg: "请填写身份证姓名" });
       validation.push({ fields: "idcard_number", msg: "请填写身份证号码" });
       validation.push({ fields: "idcard_front", msg: "请上传身份证正面照片" });
       validation.push({ fields: "idcard_back", msg: "请上传身份证背面照片" });
-    } else {
-      form_data['idcard_name'] = self.data.address_data.idcard_name || '';
-      form_data['idcard_number'] = self.data.address_data.idcard_number || '';
+
+      // 数据
+      form_data['idcard_front'] = self.data.idcard_images_data.idcard_front || '';
+      form_data['idcard_back'] = self.data.idcard_images_data.idcard_back || '';
     }
 
     form_data['province'] = self.data.province_id;
@@ -462,8 +464,6 @@ Page({
     form_data['county'] = self.data.county_id;
     form_data['id'] = self.data.params.id || 0;
     form_data['is_default'] = form_data.is_default == true ? 1 : 0;
-    form_data['idcard_front'] = self.data.idcard_images_data.idcard_front || '';
-    form_data['idcard_back'] = self.data.idcard_images_data.idcard_back || '';
 
     // 地理位置
     var lng = 0;

sourcecode/qq/default/pages/user-address-save/user-address-save.js

@@ -448,13 +448,15 @@ Page({
     // 是否开启了用户身份证信息
     if(self.data.home_user_address_idcard_status == 1)
     {
+      // 验证
       validation.push({ fields: "idcard_name", msg: "请填写身份证姓名" });
       validation.push({ fields: "idcard_number", msg: "请填写身份证号码" });
       validation.push({ fields: "idcard_front", msg: "请上传身份证正面照片" });
       validation.push({ fields: "idcard_back", msg: "请上传身份证背面照片" });
-    } else {
-      form_data['idcard_name'] = self.data.address_data.idcard_name || '';
-      form_data['idcard_number'] = self.data.address_data.idcard_number || '';
+
+      // 数据
+      form_data['idcard_front'] = self.data.idcard_images_data.idcard_front || '';
+      form_data['idcard_back'] = self.data.idcard_images_data.idcard_back || '';
     }
 
     form_data['province'] = self.data.province_id;
@@ -462,8 +464,6 @@ Page({
     form_data['county'] = self.data.county_id;
     form_data['id'] = self.data.params.id || 0;
     form_data['is_default'] = form_data.is_default == true ? 1 : 0;
-    form_data['idcard_front'] = self.data.idcard_images_data.idcard_front || '';
-    form_data['idcard_back'] = self.data.idcard_images_data.idcard_back || '';
 
     // 地理位置
     var lng = 0;

sourcecode/toutiao/default/pages/user-address-save/user-address-save.js

@@ -454,13 +454,15 @@ Page({
     // 是否开启了用户身份证信息
     if(self.data.home_user_address_idcard_status == 1)
     {
+      // 验证
       validation.push({ fields: "idcard_name", msg: "请填写身份证姓名" });
       validation.push({ fields: "idcard_number", msg: "请填写身份证号码" });
       validation.push({ fields: "idcard_front", msg: "请上传身份证正面照片" });
       validation.push({ fields: "idcard_back", msg: "请上传身份证背面照片" });
-    } else {
-      form_data['idcard_name'] = self.data.address_data.idcard_name || '';
-      form_data['idcard_number'] = self.data.address_data.idcard_number || '';
+
+      // 数据
+      form_data['idcard_front'] = self.data.idcard_images_data.idcard_front || '';
+      form_data['idcard_back'] = self.data.idcard_images_data.idcard_back || '';
     }
 
     form_data['province'] = self.data.province_id;
@@ -468,8 +470,6 @@ Page({
     form_data['county'] = self.data.county_id;
     form_data['id'] = self.data.params.id || 0;
     form_data['is_default'] = form_data.is_default == true ? 1 : 0;
-    form_data['idcard_front'] = self.data.idcard_images_data.idcard_front || '';
-    form_data['idcard_back'] = self.data.idcard_images_data.idcard_back || '';
 
     // 地理位置
     // var lng = 0;

sourcecode/weixin/default/pages/user-address-save/user-address-save.js

@@ -451,13 +451,15 @@ Page({
     // 是否开启了用户身份证信息
     if(self.data.home_user_address_idcard_status == 1)
     {
+      // 验证
       validation.push({ fields: "idcard_name", msg: "请填写身份证姓名" });
       validation.push({ fields: "idcard_number", msg: "请填写身份证号码" });
       validation.push({ fields: "idcard_front", msg: "请上传身份证正面照片" });
       validation.push({ fields: "idcard_back", msg: "请上传身份证背面照片" });
-    } else {
-      form_data['idcard_name'] = self.data.address_data.idcard_name || '';
-      form_data['idcard_number'] = self.data.address_data.idcard_number || '';
+
+      // 数据
+      form_data['idcard_front'] = self.data.idcard_images_data.idcard_front || '';
+      form_data['idcard_back'] = self.data.idcard_images_data.idcard_back || '';
     }
 
     form_data['province'] = self.data.province_id;
@@ -465,8 +467,6 @@ Page({
     form_data['county'] = self.data.county_id;
     form_data['id'] = self.data.params.id || 0;
     form_data['is_default'] = form_data.is_default == true ? 1 : 0;
-    form_data['idcard_front'] = self.data.idcard_images_data.idcard_front || '';
-    form_data['idcard_back'] = self.data.idcard_images_data.idcard_back || '';
 
     // 地理位置
     var lng = 0;