diff --git a/sourcecode/alipay/default/pages/user-address-save/user-address-save.axml b/sourcecode/alipay/default/pages/user-address-save/user-address-save.axml index 88834ab06e354335f0d7a35ee538177d6e24c4c9..6bc96371ef652cf7f3b6756cc278a13da6e83c57 100755 --- a/sourcecode/alipay/default/pages/user-address-save/user-address-save.axml +++ b/sourcecode/alipay/default/pages/user-address-save/user-address-save.axml @@ -61,15 +61,15 @@ - 身份证姓名选填,请务必与上传的身份证件姓名保持一致 + 身份证姓名必填请务必与上传的身份证件姓名保持一致 - 身份证号码选填,请务必与上传的身份证件号码保持一致 + 身份证号码必填请务必与上传的身份证件号码保持一致 - 身份证照片选填,请使用身份证原件拍摄,图片要清晰 + 身份证照片必传请使用身份证原件拍摄,图片要清晰 x diff --git a/sourcecode/alipay/default/pages/user-address-save/user-address-save.js b/sourcecode/alipay/default/pages/user-address-save/user-address-save.js index de913e7cac47b807c53e3f41079d7740ff9f1c0b..4bd4149302598b0ca94c062b94971bfe63e52208 100644 --- a/sourcecode/alipay/default/pages/user-address-save/user-address-save.js +++ b/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)) { diff --git a/sourcecode/baidu/default/pages/user-address-save/user-address-save.js b/sourcecode/baidu/default/pages/user-address-save/user-address-save.js index 831ffe3f2794fb7d3690484313c66ebdd6c0a64b..a57f3e02582e83e5557d098fc45045f5770b4b73 100755 --- a/sourcecode/baidu/default/pages/user-address-save/user-address-save.js +++ b/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)) { diff --git a/sourcecode/baidu/default/pages/user-address-save/user-address-save.swan b/sourcecode/baidu/default/pages/user-address-save/user-address-save.swan index 2313ce99f5abdf602d1708f7d95b7925f40d2e31..f330a7bf2fad0c52ab7d15af86366b28ec6f6faa 100755 --- a/sourcecode/baidu/default/pages/user-address-save/user-address-save.swan +++ b/sourcecode/baidu/default/pages/user-address-save/user-address-save.swan @@ -61,15 +61,15 @@ - 身份证姓名选填,请务必与上传的身份证件姓名保持一致 + 身份证姓名必填请务必与上传的身份证件姓名保持一致 - 身份证号码选填,请务必与上传的身份证件号码保持一致 + 身份证号码必填请务必与上传的身份证件号码保持一致 - 身份证照片选填,请使用身份证原件拍摄,图片要清晰 + 身份证照片必传请使用身份证原件拍摄,图片要清晰 x diff --git a/sourcecode/qq/default/pages/user-address-save/user-address-save.js b/sourcecode/qq/default/pages/user-address-save/user-address-save.js index c1d7e3e405e52a9ffd4e260727c88722b2a77ba0..fa4c0859233a5ed0fd0ec576e15b33c7093b50b3 100755 --- a/sourcecode/qq/default/pages/user-address-save/user-address-save.js +++ b/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)) { diff --git a/sourcecode/qq/default/pages/user-address-save/user-address-save.qml b/sourcecode/qq/default/pages/user-address-save/user-address-save.qml index a9937e8a646cf02f782b5ae9b105716d07981f4e..30c1ade464254ac8e616bf8a05e324433447bf3f 100755 --- a/sourcecode/qq/default/pages/user-address-save/user-address-save.qml +++ b/sourcecode/qq/default/pages/user-address-save/user-address-save.qml @@ -61,15 +61,15 @@ - 身份证姓名选填,请务必与上传的身份证件姓名保持一致 + 身份证姓名必填请务必与上传的身份证件姓名保持一致 - 身份证号码选填,请务必与上传的身份证件号码保持一致 + 身份证号码必填请务必与上传的身份证件号码保持一致 - 身份证照片选填,请使用身份证原件拍摄,图片要清晰 + 身份证照片必传请使用身份证原件拍摄,图片要清晰 x diff --git a/sourcecode/toutiao/default/pages/user-address-save/user-address-save.js b/sourcecode/toutiao/default/pages/user-address-save/user-address-save.js index e89f68055c9021df54bb5b547a40f81e383d118c..04e973c1a82b9d82bfc1f13f3bdf6017c6cb7b0a 100755 --- a/sourcecode/toutiao/default/pages/user-address-save/user-address-save.js +++ b/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)) { diff --git a/sourcecode/toutiao/default/pages/user-address-save/user-address-save.ttml b/sourcecode/toutiao/default/pages/user-address-save/user-address-save.ttml index 5fe5b4d94d550e2bc787e5f4c1f90321c9ded5ea..616cef22372efbdb3ba5b1d2e4d480d31a498def 100755 --- a/sourcecode/toutiao/default/pages/user-address-save/user-address-save.ttml +++ b/sourcecode/toutiao/default/pages/user-address-save/user-address-save.ttml @@ -61,15 +61,15 @@ - 身份证姓名选填,请务必与上传的身份证件姓名保持一致 + 身份证姓名必填请务必与上传的身份证件姓名保持一致 - 身份证号码选填,请务必与上传的身份证件号码保持一致 + 身份证号码必填请务必与上传的身份证件号码保持一致 - 身份证照片选填,请使用身份证原件拍摄,图片要清晰 + 身份证照片必传请使用身份证原件拍摄,图片要清晰 x diff --git a/sourcecode/weixin/default/pages/user-address-save/user-address-save.js b/sourcecode/weixin/default/pages/user-address-save/user-address-save.js index 65bf6c1c78cea25230fcf6904fb95843b50c5261..04afe0959486646be37eed54a0dbfef4966e6198 100755 --- a/sourcecode/weixin/default/pages/user-address-save/user-address-save.js +++ b/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)) { diff --git a/sourcecode/weixin/default/pages/user-address-save/user-address-save.wxml b/sourcecode/weixin/default/pages/user-address-save/user-address-save.wxml index f521eeb782ca4fdf44ae2f76fde7580efb58504d..e2b170de3e74eede8dce7fce43ce3dce3c85bd42 100755 --- a/sourcecode/weixin/default/pages/user-address-save/user-address-save.wxml +++ b/sourcecode/weixin/default/pages/user-address-save/user-address-save.wxml @@ -61,15 +61,15 @@ - 身份证姓名选填,请务必与上传的身份证件姓名保持一致 + 身份证姓名必填请务必与上传的身份证件姓名保持一致 - 身份证号码选填,请务必与上传的身份证件号码保持一致 + 身份证号码必填请务必与上传的身份证件号码保持一致 - 身份证照片选填,请使用身份证原件拍摄,图片要清晰 + 身份证照片必传请使用身份证原件拍摄,图片要清晰 x