Authored by xuqi

BLK-1135

... ... @@ -50,7 +50,7 @@ addressDialogTpl = require('../../../tpl/shopping/address-dialog.hbs');
addressTpl = require('../../../tpl/shopping/address-list.hbs');
// address dialog 数据验证
function validateAddress($el) {
function validateAddress($el, isUpdate) {
var field = {
name: [
{
... ... @@ -72,10 +72,6 @@ function validateAddress($el) {
{
noEmpty: true,
err: '手机号码不能为空'
},
{
regx: /^\d{3}(\d|\*){4}\d{4}$/, // 验证正常数字或者****
err: '手机号码格式不正确'
}
],
phone: [
... ... @@ -95,6 +91,19 @@ function validateAddress($el) {
var pass = true;
// 新增情况下须验证正确的手机号;编辑情况下可通过****的验证
if (isUpdate) {
field.mobile.push({
regx: /^\d{3}(\d|\*){4}\d{4}$/, // 验证正常数字或者****
err: '手机号码格式不正确'
});
} else {
field.mobile.push({
regx: /^\d{11}$/,
err: '手机号码格式不正确'
});
}
for (key in field) {
if (field.hasOwnProperty(key)) {
$cur = $el.find('.address-' + key);
... ... @@ -160,7 +169,7 @@ function addressDialogFactory(opt, $the) {
areaCode;
// 验证输入
if (validateAddress(address.$el)) {
if (validateAddress(address.$el, opt && opt.id)) {
// form value
consignee = $el.find('.address-name').val();
... ...