Merge branch 'dev_2.2' into test

@@ -43,6 +43,7 @@
                                        aria-describedby="basic-addon2" required>
                                 <span class="input-group-addon" id="basic-addon2">.yohobuy.com</span>
                             </div>
+                            <p style="margin-top: 10px"><span class="red">注：1. 1-32个字符；2. 只能填英文和破折号-，不区分大小写，不能以破折号开头或者结尾</span></p>
                         </div>
                     </div>
                     <div class="form-group">
@@ -85,6 +86,7 @@
                         </div>
                         <div class="col-sm-8">
                             <input type="file" id="shopLogo" name="shopLogo" value="<%data.shopLogo%>">
+                            <p><span class="red" style="position: absolute; bottom: 0">提示: 请上传像素为150*150的图片，大小小于500KB</span></p>
                         </div>
                     </div>
                     <div class="form-group">

@@ -258,6 +258,22 @@ e.on("validate",function(){
     
 });
 
+// 对域名格式和长度做校验
+e.on("validate", function() {
+    var shopDomainVal = $("#shopDomain").val();
+    if(shopDomainVal) {
+        var shopDomainPattern = new RegExp("^[a-zA-Z]([a-zA-Z-])*[a-zA-Z]$");
+
+        if(shopDomainVal.length < 1 || shopDomainVal.length > 32) {
+            return "店铺域名输入有误！";
+        }
+
+        if(!shopDomainPattern.test(shopDomainVal)) {
+            return "店铺域名输入有误！";
+        }
+    }
+});
+
 e.init();
 
 var submit=function(callback){