Merge remote-tracking branch 'origin/developerA' into developerA

src/main/java/com/caimei/modules/user/entity/NewCmShop.java

@@ -60,6 +60,9 @@ public class NewCmShop extends DataEntity<NewCmShop> {
     private String scope;        // scope
     private String info;        // 介绍
     private String productDesc;        // 主打产品说明
+    private String website;     // 网址
+    private String wxOfficialAccount;   //微信公众号
+    private String wxApplets;       //微信小程序
     private Double lng;        // lng
     private Double lat;        // lat
     private String addTime;        // 添加时间
@@ -487,7 +490,7 @@ public class NewCmShop extends DataEntity<NewCmShop> {
         this.scope = scope;
     }
 
-    @Length(min = 0, max = 2500, message = "介绍长度必须介于 0 和 2500 之间")
+    @Length(min = 0, max = 5000, message = "介绍长度必须介于 0 和 5000 之间")
     public String getInfo() {
         return info;
     }
@@ -496,7 +499,7 @@ public class NewCmShop extends DataEntity<NewCmShop> {
         this.info = info;
     }
 
-    @Length(min = 0, max = 1000, message = "主打产品说明长度必须介于 0 和 1000 之间")
+    @Length(min = 0, max = 5000, message = "主打产品说明长度必须介于 0 和 5000 之间")
     public String getProductDesc() {
         return productDesc;
     }
@@ -1020,4 +1023,28 @@ public class NewCmShop extends DataEntity<NewCmShop> {
     public void setSocialCreditCode(String socialCreditCode) {
         this.socialCreditCode = socialCreditCode;
     }
+
+    public String getWebsite() {
+        return website;
+    }
+
+    public void setWebsite(String website) {
+        this.website = website;
+    }
+
+    public String getWxOfficialAccount() {
+        return wxOfficialAccount;
+    }
+
+    public void setWxOfficialAccount(String wxOfficialAccount) {
+        this.wxOfficialAccount = wxOfficialAccount;
+    }
+
+    public String getWxApplets() {
+        return wxApplets;
+    }
+
+    public void setWxApplets(String wxApplets) {
+        this.wxApplets = wxApplets;
+    }
 }

src/main/resources/mappings/modules/user/NewCmShopMapper.xml

@@ -47,6 +47,9 @@
 		a.scope AS "scope",
 		a.info AS "info",
 		a.productDesc AS "productDesc",
+		a.website,
+		a.wxOfficialAccount,
+		a.wxApplets,
 		a.lng AS "lng",
 		a.lat AS "lat",
 		a.addTime AS "addTime",
@@ -378,6 +381,9 @@
 		UPDATE shop
 		<set>
 			name = #{name},
+		    website = #{website},
+			wxOfficialAccount = #{wxOfficialAccount},
+			wxApplets = #{wxApplets},
 			<if test="sname != null and sname != ''" >
 				sname = #{sname},
 			</if>

src/main/webapp/WEB-INF/views/modules/user/newCmShopForm.jsp

@@ -10,8 +10,8 @@
 		loadProvince();
 			//$("#name").focus();
 			$("#inputForm").validate({
-				ignore:"",
 				submitHandler: function(form){
+					debugger
 					var bindMobile = $("#contractMobile").val();
 					var userID = $("#userID").val();
 					$.post("${ctx}/new/user/agency/checkMobile?bindMobile="+bindMobile+"&userID="+userID, function (data) {
@@ -777,7 +777,7 @@ function loadTown(curTown) {
 		</div>
 		<div class="control-group">
 		<b>公司经营信息</b>
-			<table>
+			<table style="border-collapse: separate; border-spacing: 10px; ">
 				<tr>
 					<td>
 						<span><font color="red">*</font>公司类型：</span>
@@ -862,18 +862,34 @@ function loadTown(curTown) {
                 		</div>
 					</td>
 				</tr>
-
 				<tr>
 					<td>
-						<span><font color="red">*</font>公司简介：</span>
-						<form:textarea path="info" htmlEscape="false"  style="margin: 0px; width: 300px; height: 95px;" maxlength="2000" class="input-xlarge required"/>
+						<span style="min-width: 130px;">官网地址：</span>
+						<form:input path="website" htmlEscape="false" maxlength="100" placeholder="请输入网址" class="input-xlarge"/>
+					</td>
+				</tr>
+				<tr>
+					<td>
+						<span style="min-width: 130px;">微信公众号：</span>
+						<form:input path="wxOfficialAccount" htmlEscape="false" maxlength="20" placeholder="请输入微信公众号名称" class="input-xlarge"/>
+					</td>
+				</tr>
+				<tr>
+					<td>
+						<span style="min-width: 130px;">微信小程序：</span>
+						<form:input path="wxApplets" htmlEscape="false" maxlength="20" placeholder="请输入微信小程序名称" class="input-xlarge"/>
+					</td>
+				</tr>
+				<tr>
+					<td>
+						<span style="min-width: 130px;"><font color="red">*</font>主打系列商品说明：</span>
+						<form:textarea path="productDesc" htmlEscape="false" style="margin: 0px; width: 600px; height: 120px;" maxlength="5000" placeholder="请输入公司主打系列商品说明" class="input-xlarge required"/>
 					</td>
 				</tr>
-
 				<tr>
 					<td>
-						<span><font color="red">*</font>主打产品说明：</span>
-						<form:textarea path="productDesc" htmlEscape="false" style="margin: 0px; width: 300px; height: 95px;" maxlength="500" class="input-xlarge required"/>
+						<span style="min-width: 130px;"><font color="red">*</font>公司介绍：</span>
+						<form:textarea path="info" htmlEscape="false"  style="margin: 0px; width: 600px; height: 120px;" maxlength="5000" placeholder="公司介绍会展示在公司主页，有助于机构更好的了解您公司， 建议从规模、产品、服务、荣誉资质这4方面进行介绍" class="input-xlarge required"/>
 					</td>
 				</tr>
 			</table>