用户地址地理位置和身份证优化

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

@@ -61,15 +61,15 @@
         <!-- 身份证信息 -->
         <view a:if="{{home_user_address_idcard_status == 1}}" class="idcard-container">
             <view class="form-gorup bg-white">
-                <view class="form-gorup-title">身份证姓名<text class="form-group-tips">选填，请务必与上传的身份证件姓名保持一致</text></view>
+                <view class="form-gorup-title">身份证姓名<text class="form-group-tips-must">必填</text><text class="form-group-tips">请务必与上传的身份证件姓名保持一致</text></view>
                 <input type="text" name="idcard_name" value="{{address_data.idcard_name || ''}}" maxlength="16" placeholder-class="cr-ccc" class="cr-666" placeholder="身份证姓名格式 2~16 个字符之间" />
             </view>
             <view class="form-gorup bg-white">
-                <view class="form-gorup-title">身份证号码<text class="form-group-tips">选填，请务必与上传的身份证件号码保持一致</text></view>
+                <view class="form-gorup-title">身份证号码<text class="form-group-tips-must">必填</text><text class="form-group-tips">请务必与上传的身份证件号码保持一致</text></view>
                 <input type="idcard" name="idcard_number" value="{{address_data.idcard_number || ''}}" maxlength="18" placeholder-class="cr-ccc" class="cr-666" placeholder="身份证号码格式最多18个字符" />
             </view>
             <view class="form-gorup bg-white form-container-upload oh">
-                <view class="form-gorup-title">身份证照片<text class="form-group-tips">选填，请使用身份证原件拍摄，图片要清晰</text></view>
+                <view class="form-gorup-title">身份证照片<text class="form-group-tips-must">必传</text><text class="form-group-tips"><text class="form-group-tips">请使用身份证原件拍摄，图片要清晰</text></view>
                 <view class="form-upload-data">
                     <view class="item fl">
                         <text a:if="{{(idcard_images_data.idcard_front || null) != null}}" class="delete-icon" onTap="upload_delete_event" data-value="idcard_front">x</text>

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

@@ -436,16 +436,33 @@ Page({
       { fields: "province", msg: "请选择省份" },
       { fields: "city", msg: "请选择城市" },
       { fields: "county", msg: "请选择区县" },
-      { fields: "address", msg: "请填写详细地址" },
-      { fields: "lng", msg: "请选择地理位置" },
-      { fields: "lat", msg: "请选择地理位置" }
+      { fields: "address", msg: "请填写详细地址" }
     ];
 
-    form_data["province"] = self.data.province_id;
-    form_data["city"] = self.data.city_id;
-    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;
+    // 是否开启了地理位置选择
+    if(self.data.home_user_address_map_status == 1)
+    {
+      validation.push({ fields: "lng", msg: "请选择地理位置" });
+      validation.push({ fields: "lat", msg: "请选择地理位置" });
+    }
+
+    // 是否开启了用户身份证信息
+    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['province'] = self.data.province_id;
+    form_data['city'] = self.data.city_id;
+    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 || '';
 
@@ -464,8 +481,8 @@ Page({
         lat = self.data.address_data.lat || 0;
       }
     }
-    form_data["lng"] = lng;
-    form_data["lat"] = lat;
+    form_data['lng'] = lng;
+    form_data['lat'] = lat;
 
     // 验证提交表单
     if (app.fields_check(form_data, validation)) {

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

@@ -435,16 +435,33 @@ Page({
       { fields: "province", msg: "请选择省份" },
       { fields: "city", msg: "请选择城市" },
       { fields: "county", msg: "请选择区县" },
-      { fields: "address", msg: "请填写详细地址" },
-      { fields: "lng", msg: "请选择地理位置" },
-      { fields: "lat", msg: "请选择地理位置" }
+      { fields: "address", msg: "请填写详细地址" }
     ];
 
-    form_data["province"] = self.data.province_id;
-    form_data["city"] = self.data.city_id;
-    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;
+    // 是否开启了地理位置选择
+    if(self.data.home_user_address_map_status == 1)
+    {
+      validation.push({ fields: "lng", msg: "请选择地理位置" });
+      validation.push({ fields: "lat", msg: "请选择地理位置" });
+    }
+
+    // 是否开启了用户身份证信息
+    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['province'] = self.data.province_id;
+    form_data['city'] = self.data.city_id;
+    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 || '';
 
@@ -463,8 +480,8 @@ Page({
         lat = self.data.address_data.lat || 0;
       }
     }
-    form_data["lng"] = lng;
-    form_data["lat"] = lat;
+    form_data['lng'] = lng;
+    form_data['lat'] = lat;
 
     // 验证提交表单
     if (app.fields_check(form_data, validation)) {

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

@@ -61,15 +61,15 @@
         <!-- 身份证信息 -->
         <view s-if="home_user_address_idcard_status == 1" class="idcard-container">
             <view class="form-gorup bg-white">
-                <view class="form-gorup-title">身份证姓名<text class="form-group-tips">选填，请务必与上传的身份证件姓名保持一致</text></view>
+                <view class="form-gorup-title">身份证姓名<text class="form-group-tips-must">必填</text><text class="form-group-tips">请务必与上传的身份证件姓名保持一致</text></view>
                 <input type="text" name="idcard_name" value="{{address_data.idcard_name || ''}}" maxlength="16" placeholder-class="cr-ccc" class="cr-666" placeholder="身份证姓名格式 2~16 个字符之间" />
             </view>
             <view class="form-gorup bg-white">
-                <view class="form-gorup-title">身份证号码<text class="form-group-tips">选填，请务必与上传的身份证件号码保持一致</text></view>
+                <view class="form-gorup-title">身份证号码<text class="form-group-tips-must">必填</text><text class="form-group-tips">请务必与上传的身份证件号码保持一致</text></view>
                 <input type="idcard" name="idcard_number" value="{{address_data.idcard_number || ''}}" maxlength="18" placeholder-class="cr-ccc" class="cr-666" placeholder="身份证号码格式最多18个字符" />
             </view>
             <view class="form-gorup bg-white form-container-upload oh">
-                <view class="form-gorup-title">身份证照片<text class="form-group-tips">选填，请使用身份证原件拍摄，图片要清晰</text></view>
+                <view class="form-gorup-title">身份证照片<text class="form-group-tips-must">必传</text><text class="form-group-tips">请使用身份证原件拍摄，图片要清晰</text></view>
                 <view class="form-upload-data">
                     <view class="item fl">
                         <text s-if="(idcard_images_data.idcard_front || null) != null" class="delete-icon" bindtap="upload_delete_event" data-value="idcard_front">x</text>

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

@@ -435,16 +435,33 @@ Page({
       { fields: "province", msg: "请选择省份" },
       { fields: "city", msg: "请选择城市" },
       { fields: "county", msg: "请选择区县" },
-      { fields: "address", msg: "请填写详细地址" },
-      { fields: "lng", msg: "请选择地理位置" },
-      { fields: "lat", msg: "请选择地理位置" }
+      { fields: "address", msg: "请填写详细地址" }
     ];
 
-    form_data["province"] = self.data.province_id;
-    form_data["city"] = self.data.city_id;
-    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;
+    // 是否开启了地理位置选择
+    if(self.data.home_user_address_map_status == 1)
+    {
+      validation.push({ fields: "lng", msg: "请选择地理位置" });
+      validation.push({ fields: "lat", msg: "请选择地理位置" });
+    }
+
+    // 是否开启了用户身份证信息
+    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['province'] = self.data.province_id;
+    form_data['city'] = self.data.city_id;
+    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 || '';
 
@@ -463,8 +480,8 @@ Page({
         lat = self.data.address_data.lat || 0;
       }
     }
-    form_data["lng"] = lng;
-    form_data["lat"] = lat;
+    form_data['lng'] = lng;
+    form_data['lat'] = lat;
 
     // 验证提交表单
     if (app.fields_check(form_data, validation)) {

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

@@ -61,15 +61,15 @@
         <!-- 身份证信息 -->
         <view qq:if="{{home_user_address_idcard_status == 1}}" class="idcard-container">
             <view class="form-gorup bg-white">
-                <view class="form-gorup-title">身份证姓名<text class="form-group-tips">选填，请务必与上传的身份证件姓名保持一致</text></view>
+                <view class="form-gorup-title">身份证姓名<text class="form-group-tips-must">必填</text><text class="form-group-tips">请务必与上传的身份证件姓名保持一致</text></view>
                 <input type="text" name="idcard_name" value="{{address_data.idcard_name || ''}}" maxlength="16" placeholder-class="cr-ccc" class="cr-666" placeholder="身份证姓名格式 2~16 个字符之间" />
             </view>
             <view class="form-gorup bg-white">
-                <view class="form-gorup-title">身份证号码<text class="form-group-tips">选填，请务必与上传的身份证件号码保持一致</text></view>
+                <view class="form-gorup-title">身份证号码<text class="form-group-tips-must">必填</text><text class="form-group-tips">请务必与上传的身份证件号码保持一致</text></view>
                 <input type="idcard" name="idcard_number" value="{{address_data.idcard_number || ''}}" maxlength="18" placeholder-class="cr-ccc" class="cr-666" placeholder="身份证号码格式最多18个字符" />
             </view>
             <view class="form-gorup bg-white form-container-upload oh">
-                <view class="form-gorup-title">身份证照片<text class="form-group-tips">选填，请使用身份证原件拍摄，图片要清晰</text></view>
+                <view class="form-gorup-title">身份证照片<text class="form-group-tips-must">必传</text><text class="form-group-tips">请使用身份证原件拍摄，图片要清晰</text></view>
                 <view class="form-upload-data">
                     <view class="item fl">
                         <text qq:if="{{(idcard_images_data.idcard_front || null) != null}}" class="delete-icon" bindtap="upload_delete_event" data-value="idcard_front">x</text>

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

@@ -441,16 +441,33 @@ Page({
       { fields: "province", msg: "请选择省份" },
       { fields: "city", msg: "请选择城市" },
       { fields: "county", msg: "请选择区县" },
-      { fields: "address", msg: "请填写详细地址" },
-      // { fields: "lng", msg: "请选择地理位置" },
-      // { fields: "lat", msg: "请选择地理位置" }
+      { fields: "address", msg: "请填写详细地址" }
     ];
 
-    form_data["province"] = self.data.province_id;
-    form_data["city"] = self.data.city_id;
-    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;
+    // 是否开启了地理位置选择
+    // if(self.data.home_user_address_map_status == 1)
+    // {
+    //   validation.push({ fields: "lng", msg: "请选择地理位置" });
+    //   validation.push({ fields: "lat", msg: "请选择地理位置" });
+    // }
+
+    // 是否开启了用户身份证信息
+    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['province'] = self.data.province_id;
+    form_data['city'] = self.data.city_id;
+    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 || '';
 
@@ -469,8 +486,8 @@ Page({
     //     lat = self.data.address_data.lat || 0;
     //   }
     // }
-    // form_data["lng"] = lng;
-    // form_data["lat"] = lat;
+    // form_data['lng'] = lng;
+    // form_data['lat'] = lat;
 
     // 验证提交表单
     if (app.fields_check(form_data, validation)) {

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

@@ -61,15 +61,15 @@
         <!-- 身份证信息 -->
         <view tt:if="{{home_user_address_idcard_status == 1}}" class="idcard-container">
             <view class="form-gorup bg-white">
-                <view class="form-gorup-title">身份证姓名<text class="form-group-tips">选填，请务必与上传的身份证件姓名保持一致</text></view>
+                <view class="form-gorup-title">身份证姓名<text class="form-group-tips-must">必填</text><text class="form-group-tips">请务必与上传的身份证件姓名保持一致</text></view>
                 <input type="text" name="idcard_name" value="{{address_data.idcard_name || ''}}" maxlength="16" placeholder-class="cr-ccc" class="cr-666" placeholder="身份证姓名格式 2~16 个字符之间" />
             </view>
             <view class="form-gorup bg-white">
-                <view class="form-gorup-title">身份证号码<text class="form-group-tips">选填，请务必与上传的身份证件号码保持一致</text></view>
+                <view class="form-gorup-title">身份证号码<text class="form-group-tips-must">必填</text><text class="form-group-tips">请务必与上传的身份证件号码保持一致</text></view>
                 <input type="idcard" name="idcard_number" value="{{address_data.idcard_number || ''}}" maxlength="18" placeholder-class="cr-ccc" class="cr-666" placeholder="身份证号码格式最多18个字符" />
             </view>
             <view class="form-gorup bg-white form-container-upload oh">
-                <view class="form-gorup-title">身份证照片<text class="form-group-tips">选填，请使用身份证原件拍摄，图片要清晰</text></view>
+                <view class="form-gorup-title">身份证照片<text class="form-group-tips-must">必传</text><text class="form-group-tips">请使用身份证原件拍摄，图片要清晰</text></view>
                 <view class="form-upload-data">
                     <view class="item fl">
                         <text tt:if="{{(idcard_images_data.idcard_front || null) != null}}" class="delete-icon" bindtap="upload_delete_event" data-value="idcard_front">x</text>

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

@@ -438,16 +438,33 @@ Page({
       { fields: "province", msg: "请选择省份" },
       { fields: "city", msg: "请选择城市" },
       { fields: "county", msg: "请选择区县" },
-      { fields: "address", msg: "请填写详细地址" },
-      { fields: "lng", msg: "请选择地理位置" },
-      { fields: "lat", msg: "请选择地理位置" }
+      { fields: "address", msg: "请填写详细地址" }
     ];
 
-    form_data["province"] = self.data.province_id;
-    form_data["city"] = self.data.city_id;
-    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;
+    // 是否开启了地理位置选择
+    if(self.data.home_user_address_map_status == 1)
+    {
+      validation.push({ fields: "lng", msg: "请选择地理位置" });
+      validation.push({ fields: "lat", msg: "请选择地理位置" });
+    }
+
+    // 是否开启了用户身份证信息
+    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['province'] = self.data.province_id;
+    form_data['city'] = self.data.city_id;
+    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 || '';
 
@@ -466,8 +483,8 @@ Page({
         lat = self.data.address_data.lat || 0;
       }
     }
-    form_data["lng"] = lng;
-    form_data["lat"] = lat;
+    form_data['lng'] = lng;
+    form_data['lat'] = lat;
 
     // 验证提交表单
     if (app.fields_check(form_data, validation)) {

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

@@ -61,15 +61,15 @@
         <!-- 身份证信息 -->
         <view wx:if="{{home_user_address_idcard_status == 1}}" class="idcard-container">
             <view class="form-gorup bg-white">
-                <view class="form-gorup-title">身份证姓名<text class="form-group-tips">选填，请务必与上传的身份证件姓名保持一致</text></view>
+                <view class="form-gorup-title">身份证姓名<text class="form-group-tips-must">必填</text><text class="form-group-tips">请务必与上传的身份证件姓名保持一致</text></view>
                 <input type="text" name="idcard_name" value="{{address_data.idcard_name || ''}}" maxlength="16" placeholder-class="cr-ccc" class="cr-666" placeholder="身份证姓名格式 2~16 个字符之间" />
             </view>
             <view class="form-gorup bg-white">
-                <view class="form-gorup-title">身份证号码<text class="form-group-tips">选填，请务必与上传的身份证件号码保持一致</text></view>
+                <view class="form-gorup-title">身份证号码<text class="form-group-tips-must">必填</text><text class="form-group-tips">请务必与上传的身份证件号码保持一致</text></view>
                 <input type="idcard" name="idcard_number" value="{{address_data.idcard_number || ''}}" maxlength="18" placeholder-class="cr-ccc" class="cr-666" placeholder="身份证号码格式最多18个字符" />
             </view>
             <view class="form-gorup bg-white form-container-upload oh">
-                <view class="form-gorup-title">身份证照片<text class="form-group-tips">选填，请使用身份证原件拍摄，图片要清晰</text></view>
+                <view class="form-gorup-title">身份证照片<text class="form-group-tips-must">必传</text><text class="form-group-tips">请使用身份证原件拍摄，图片要清晰</text></view>
                 <view class="form-upload-data">
                     <view class="item fl">
                         <text wx:if="{{(idcard_images_data.idcard_front || null) != null}}" class="delete-icon" bindtap="upload_delete_event" data-value="idcard_front">x</text>