fe / yohobuy-portal-fe · Commits

Go to a project

Authored by 王钱钧
Commit f0f0f544cea80ddabc718d0490a35afec9a199d2 2 parents 4ed7da35 0192f688

Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6

Inline Side-by-side
Showing 3 changed files with 14 additions and 14 deletions
... ... @@ -8,18 +8,18 @@ var edit=require('../common/edit');
var contactPhone=$.trim($("#contactPhone").val());
// if(contactPhone){
// if(!(/^1\d{10}$/.test(contactPhone))){
// return "请输入正确的公司联系电话";
// }
// }
if(contactPhone){
if(!(/^[0-9-()]*$/.test(contactPhone))){
return "请输入正确的公司联系电话";
}
}
//phone
var phone=$.trim($("#phone").val());
// if(phone){
// if(!(/^1\d{10}$/.test(phone))){
// return "请输入正确的联系人电话";
// }
// }
if(phone){
if(!(/^[0-9-()]*$/.test(phone))){
return "请输入正确的联系人电话";
}
}
if(!phone&&!contactPhone){
return "请在公司联系电话,联系人电话至少填一个";
}
... ...
{{# headerTab}}
<!-- {{# headerTab}}
<div class="tabheader">
<ul class="nav nav-tabs">
<li {{# changePrice}}class="active"{{/ changePrice}}><a href="/goods/pricechange/index">代销变价</a></li>
<li {{# brandCooperation}}class="active"{{/ brandCooperation}}><a href="/goods/brandCooperation/index">品牌合作模式设置</a></li>
</ul>
</div>
{{/ headerTab}}
{{/ headerTab}} -->
<div class="pageheader">
... ...
... ... @@ -147,7 +147,7 @@
<p><span class="red">注：与联系人电话至少填一个</span></p>
</label>
<div class="col-sm-8">
<input type="number" maxlength="20" id="contactPhone" placeholder="请填写公司联系电话" class="form-control" value="{{contactPhone}}" >
<input type="text" maxlength="20" id="contactPhone" placeholder="请填写公司联系电话" class="form-control" value="{{contactPhone}}" >
</div>
<!--pattern="/^13[0-9]{9}$/"-->
</div>
... ... @@ -170,7 +170,7 @@
<div class="form-group">
<label class="col-sm-2 control-label">联系电话</label>
<div class="col-sm-8">
<input type="number" maxlength="20" id="phone" placeholder="请填写联系电话" class="form-control" value="{{phone}}">
<input type="text" maxlength="20" id="phone" placeholder="请填写联系电话" class="form-control" value="{{phone}}">
</div>
</div>
... ...