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

@@ -8,18 +8,18 @@ var edit=require('../common/edit');
         
         
 
 
         var contactPhone=$.trim($("#contactPhone").val());
         var contactPhone=$.trim($("#contactPhone").val());
-        // if(contactPhone){
-        //     if(!(/^1\d{10}$/.test(contactPhone))){
-        //         return "请输入正确的公司联系电话";
-        //     }
-        // }
+        if(contactPhone){
+            if(!(/^[0-9-()]*$/.test(contactPhone))){
+                return "请输入正确的公司联系电话";
+            }
+        }
         //phone
         //phone
         var phone=$.trim($("#phone").val());
         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){
         if(!phone&&!contactPhone){
             return "请在公司联系电话,联系人电话至少填一个";
             return "请在公司联系电话,联系人电话至少填一个";
         }
         }

@@ -29,7 +29,7 @@
         <div class="panel-body">
         <div class="panel-body">
             <div class="row">
             <div class="row">
                 <div class="panel-col">
                 <div class="panel-col">
-                    <input type="text" id="productSkn" value="" class="form-control" placeholder="SKN"
+                    <input type="number" id="productSkn" value="" class="form-control" placeholder="SKN"
                            style="height: 39px;"/>
                            style="height: 39px;"/>
                 </div>
                 </div>
                 <div class="panel-col">
                 <div class="panel-col">

@@ -147,7 +147,7 @@
                                 <p><span class="red">注：与联系人电话至少填一个</span></p>
                                 <p><span class="red">注：与联系人电话至少填一个</span></p>
                                 </label>
                                 </label>
                                 <div class="col-sm-8">
                                 <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>
                                 </div>
                                 <!--pattern="/^13[0-9]{9}$/"-->
                                 <!--pattern="/^13[0-9]{9}$/"-->
                             </div>
                             </div>
@@ -170,7 +170,7 @@
                             <div class="form-group">
                             <div class="form-group">
                                 <label class="col-sm-2 control-label">联系电话</label>
                                 <label class="col-sm-2 control-label">联系电话</label>
                                 <div class="col-sm-8">
                                 <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>
                             </div>
                             </div>