Merge branch 'yohobuy_portal_dev_v4.5_20160601' of http://git.yoho.cn/fe/yohobuy…

…-portal-fe into yohobuy_portal_dev_v4.5_20160601

@@ -92,54 +92,72 @@ var Bll = {
             //bucket: "goodsimg"//测试
         });
         //验证英文名
-        e.on("validate", function () {
-            var englishName = $.trim($("#englishName").val());
-            var a = (/^([A-Za-z]+\s?)*[A-Za-z]$/).test(englishName);
-            if (!a) {
-                return "英文名有误"
-            }
-            return true;
-        });
+        if($("#englishName").val()){
+            e.on("validate", function () {
+                var englishName = $.trim($("#englishName").val());
+                var a = (/^([A-Za-z]+\s?)*[A-Za-z]$/).test(englishName);
+                if (!a) {
+                    return "英文名有误"
+                }
+                return true;
+            });
+        }
+
         //验证身高
-        e.on("validate", function () {
-            var height = $.trim($("#height").val());
-            if (height>250||height<100) {
-                return "身高值范围为100~250"
-            }
-            return true;
-        });
+        if($("#height").val()){
+            e.on("validate", function () {
+                var height = $.trim($("#height").val());
+                if (height>250||height<100) {
+                    return "身高值范围为100~250"
+                }
+                return true;
+            });
+        }
+
         //验证体重
-        e.on("validate", function () {
-            var weight = $.trim($("#weight").val());
-            if (weight>200||weight<10) {
-                return "体重值范围为10~200"
-            }
-            return true;
-        });
+        if($("#weight").val()){
+            e.on("validate", function () {
+                var weight = $.trim($("#weight").val());
+                if (weight>200||weight<10) {
+                    return "体重值范围为10~200"
+                }
+                return true;
+            });
+        }
+
         //验证胸围
-        e.on("validate", function () {
-            var Bust = $.trim($("#Bust").val());
-            if (Bust>200) {
-                return "胸围值应小于200"
-            }
-            return true;
-        });
+        if($("#Bust").val()){
+            e.on("validate", function () {
+                var Bust = $.trim($("#Bust").val());
+                if (Bust>200) {
+                    return "胸围值应小于200"
+                }
+                return true;
+            });
+        }
+
         //验证腰围
-        e.on("validate", function () {
-            var waist = $.trim($("#waist").val());
-            if (waist>200) {
-                return "腰围值应小于200"
-            }
-            return true;
-        });
+        if($("#waist").val()){
+            e.on("validate", function () {
+                var waist = $.trim($("#waist").val());
+                if (waist>200) {
+                    return "腰围值应小于200"
+                }
+                return true;
+            });
+        }
+
         //验证臀围
-        e.on("validate", function () {
-            var hips = $.trim($("#hips").val());
-            if (hips>200) {
-                return "臀围值应小于200"
-            }
-            return true;
-        });
+        if($("#hips").val()){
+            e.on("validate", function () {
+                var hips = $.trim($("#hips").val());
+                if (hips>200) {
+                    return "臀围值应小于200"
+                }
+                return true;
+            });
+        }
+       
         var a = common.dialog.confirm(hint,
             common.util.__template2($("#template").html(), item),
             function () {

@@ -58,20 +58,20 @@
             <input type="hidden" value="[[id]]" id="id"/>
 
             <div class="col-sm-6">
-                <input type="file" value="[[avatar]]" class="form-control avatar" id="avatar" name="avatar" placeholder="头像" required="required"/>
+                <input type="file" value="[[avatar]]" class="form-control avatar" id="avatar" name="avatar" placeholder="头像" />
             </div>
         </div>
         <div class="form-group">
             <label class="col-sm-2 control-label" for="modelName">姓名</label>
 
             <div class="col-sm-3">
-                <input type="text" value="[[modelName]]" class="form-control" id="modelName" placeholder="姓名" required="required"/>
+                <input type="text" value="[[modelName]]" class="form-control" id="modelName" placeholder="姓名" />
             </div>
 
             <label class="col-sm-2 control-label" for="englishName">英文名</label>
 
             <div class="col-sm-3">
-                <input type="text" value="[[englishName]]" class="form-control" id="englishName" placeholder="英文名" required="required"/>
+                <input type="text" value="[[englishName]]" class="form-control" id="englishName" placeholder="英文名" />
             </div>
 
 
@@ -81,7 +81,7 @@
             <label class="col-sm-2 control-label" for="nationality">国籍</label>
 
             <div class="col-sm-3">
-                <input type="text" value="[[nationality]]" class="form-control" id="nationality" placeholder="国籍" required="required"/>
+                <input type="text" value="[[nationality]]" class="form-control" id="nationality" placeholder="国籍" />
             </div>
 
         </div>
@@ -91,13 +91,13 @@
 
             <div class="col-sm-3">
                 <input type="number" value="[[height]]" class="form-control" id="height"
-                       match="numbers" placeholder="身高(cm)" required="required"/>
+                       match="numbers" placeholder="身高(cm)" />
             </div>
             <label class="col-sm-2 control-label" for="weight">体重</label>
 
             <div class="col-sm-3">
                 <input type="number" value="[[weight]]" class="form-control" id="weight"
-                       match="numbers" placeholder="体重(kg)" required="required"/>
+                       match="numbers" placeholder="体重(kg)" />
             </div>
 
         </div>
@@ -106,12 +106,12 @@
             <label class="col-sm-2 control-label" for="dressSize">穿衣尺码</label>
 
             <div class="col-sm-3">
-                <input type="text" value="[[dressSize]]" class="form-control" id="dressSize" placeholder="穿衣尺码" required="required"/>
+                <input type="text" value="[[dressSize]]" class="form-control" id="dressSize" placeholder="穿衣尺码" />
             </div>
             <label class="col-sm-2 control-label" for="shoeSize">鞋码</label>
 
             <div class="col-sm-3">
-                <input type="text" value="[[shoeSize]]" class="form-control" id="shoeSize" placeholder="鞋码" required="required"/>
+                <input type="text" value="[[shoeSize]]" class="form-control" id="shoeSize" placeholder="鞋码" />
             </div>
         </div>
         <div class="form-group">
@@ -119,22 +119,22 @@
 
             <div class="col-sm-3">
                 <input type="number" value="[[Bust]]" class="form-control" id="Bust"
-                       match="numbers" placeholder="胸围(cm)" required="required"/>
+                       match="numbers" placeholder="胸围(cm)" />
             </div>
             <div class="col-sm-3">
                 <input type="number" value="[[waist]]" class="form-control" id="waist"
-                       match="numbers" placeholder="腰围(cm)" required="required"/>
+                       match="numbers" placeholder="腰围(cm)" />
             </div>
             <div class="col-sm-3">
                 <input type="number" value="[[hips]]" class="form-control" id="hips"
-                       match="numbers" placeholder="臀围(cm)" required="required"/>
+                       match="numbers" placeholder="臀围(cm)" />
             </div>
         </div>
         <div class="form-group">
             <label class="col-sm-2 control-label" for="modelCard">模特卡</label>
 
             <div class="col-sm-10">
-                <input type="file" value="[[modelCard]]" class="form-control modelCard" id="modelCard" name="modelCard" placeholder="模特卡" required="required"/>
+                <input type="file" value="[[modelCard]]" class="form-control modelCard" id="modelCard" name="modelCard" placeholder="模特卡" />
             </div>
         </div>
     
@@ -144,7 +144,7 @@
                 <label style="cursor: pointer;"><input type="radio" name="status" checked value="1">启用</label>
                 <label style="cursor: pointer;"><input type="radio" name="status" value="0">禁用</label>
             </div>
-            <input type="hidden" id="status" value="[[status||1]]" for="radio" required>
+            <input type="hidden" id="status" value="[[status||1]]" for="radio" >
         </div>
         
     </div>