bugfix

src/main/java/com/caimei/modules/baike/service/CmBaikeProductService.java

@@ -39,43 +39,43 @@ public class CmBaikeProductService extends CrudService<CmBaikeProductDao, CmBaik
 
 	public CmBaikeProduct get(String id) {
 		CmBaikeProduct cmBaikeProduct = super.get(id);
-		String marketTime = cmBaikeProduct.getMarketTime();
-		if (StringUtils.isNotEmpty(marketTime)) {
-			String[] split = marketTime.split("-");
-			int length = split.length;
-			if (length > 0) {
-				cmBaikeProduct.setMarketYear(Integer.parseInt(split[0]));
-				if (length > 1) {
-					String splitMonth = split[1];
-					Integer marketMonth = Integer.parseInt(splitMonth.startsWith("0") ? splitMonth.replace("0", "") : splitMonth);
-					cmBaikeProduct.setMarketMonth(marketMonth);
-					if (length > 2) {
-						String splitDay = split[2];
-						Integer marketDay = Integer.parseInt(splitDay.startsWith("0") ? splitDay.replace("0", "") : splitDay);
-						cmBaikeProduct.setMarketDay(marketDay);
-					}
-				}
-			}
-		}
-		String nmpaTime = cmBaikeProduct.getNmpaTime();
-		if (StringUtils.isNotEmpty(nmpaTime)) {
-			String[] split = nmpaTime.split("-");
-			int length = split.length;
-			if (length > 0) {
-				cmBaikeProduct.setNmpaYear(Integer.parseInt(split[0]));
-				if (length > 1) {
-					String splitMonth = split[1];
-					Integer nmpaMonth = Integer.parseInt(splitMonth.startsWith("0") ? splitMonth.replace("0", "") : splitMonth);
-					cmBaikeProduct.setNmpaMonth(nmpaMonth);
-					if (length > 2) {
-						String splitDay = split[2];
-						Integer nmpaDay = Integer.parseInt(splitDay.startsWith("0") ? splitDay.replace("0", "") : splitDay);
-						cmBaikeProduct.setNmpaDay(nmpaDay);
-					}
-				}
-			}
-
-		}
+//		String marketTime = cmBaikeProduct.getMarketTime();
+//		if (StringUtils.isNotEmpty(marketTime)) {
+//			String[] split = marketTime.split("-");
+//			int length = split.length;
+//			if (length > 0) {
+//				cmBaikeProduct.setMarketYear(Integer.parseInt(split[0]));
+//				if (length > 1) {
+//					String splitMonth = split[1];
+//					Integer marketMonth = Integer.parseInt(splitMonth.startsWith("0") ? splitMonth.replace("0", "") : splitMonth);
+//					cmBaikeProduct.setMarketMonth(marketMonth);
+//					if (length > 2) {
+//						String splitDay = split[2];
+//						Integer marketDay = Integer.parseInt(splitDay.startsWith("0") ? splitDay.replace("0", "") : splitDay);
+//						cmBaikeProduct.setMarketDay(marketDay);
+//					}
+//				}
+//			}
+//		}
+//		String nmpaTime = cmBaikeProduct.getNmpaTime();
+//		if (StringUtils.isNotEmpty(nmpaTime)) {
+//			String[] split = nmpaTime.split("-");
+//			int length = split.length;
+//			if (length > 0) {
+//				cmBaikeProduct.setNmpaYear(Integer.parseInt(split[0]));
+//				if (length > 1) {
+//					String splitMonth = split[1];
+//					Integer nmpaMonth = Integer.parseInt(splitMonth.startsWith("0") ? splitMonth.replace("0", "") : splitMonth);
+//					cmBaikeProduct.setNmpaMonth(nmpaMonth);
+//					if (length > 2) {
+//						String splitDay = split[2];
+//						Integer nmpaDay = Integer.parseInt(splitDay.startsWith("0") ? splitDay.replace("0", "") : splitDay);
+//						cmBaikeProduct.setNmpaDay(nmpaDay);
+//					}
+//				}
+//			}
+//
+//		}
 		return cmBaikeProduct;
 	}
 	

src/main/java/com/caimei/modules/baike/web/CmBaikeProductController.java

@@ -115,7 +115,7 @@ public class CmBaikeProductController extends BaseController {
 		// 分类列表
 		List<CmBaikeType> typeList = cmBaikeTypeService.findList(cmBaikeType);
 		// 商品类型
-		String commodityType = cmBaikeProduct.getCommodityType() == 1 ? "产品" : "仪器";
+		String commodityType = "产品";
 		// 参数列表
 		List<CmBaikeProductParam> paramList = cmBaikeProductDao.findParamList(cmBaikeProduct.getId());
 		cmBaikeProduct.setParamList(paramList);

src/main/resources/mappings/modules/baike/CmBaikeTypeMapper.xml

@@ -56,7 +56,7 @@
 				ORDER BY ${page.orderBy}
 			</when>
 			<otherwise>
-				order by -sort desc,a.addTime desc
+				order by a.addTime desc
 			</otherwise>
 		</choose>
 	</select>

src/main/webapp/WEB-INF/views/modules/baikePage/auditBaikeProductPage.jsp

@@ -1274,7 +1274,7 @@
 	<div class="control-group">
 		<label class="control-label">SEO关键词：</label>
 		<div class="auto-input">
-			<form:input path="seoKeyword" htmlEscape="false" style="position: relative" class="input-xlarge"/>
+			<form:input path="seoKeyword" cssStyle="margin-left: 20px" htmlEscape="false" style="position: relative" class="input-xlarge"/>
 			<label id="seoKeywordSensitiveWords" class="red"></label>
 		</div>
 	</div>

src/main/webapp/WEB-INF/views/modules/baikePage/checkBaikePage.jsp

@@ -1274,7 +1274,7 @@
 	<div class="control-group">
 		<label class="control-label">SEO关键词：</label>
 		<div class="auto-input">
-			<form:input path="seoKeyword" htmlEscape="false" style="position: relative" class="input-xlarge"/>
+			<form:input path="seoKeyword" cssStyle="margin-left: 20px"  htmlEscape="false" style="position: relative" class="input-xlarge"/>
 			<label id="seoKeywordSensitiveWords" class="red"></label>
 		</div>
 	</div>

src/main/webapp/WEB-INF/views/modules/baikePage/cmBaikeProductForm.jsp

@@ -400,10 +400,10 @@
 
 		.box {
 			overflow: hidden;
-			position: absolute;
+			position: fixed;
 			width: 55%;
 			height: 60%;
-			z-index: 100; /*值越大，和其他层层叠时越在上面*/
+			z-index: 200; /*值越大，和其他层层叠时越在上面*/
 			left: 20%;
 			top: 15%;
 			background-color: #fff;
@@ -436,6 +436,7 @@
 			OVERFLOW: scroll;
 			height: calc(100% - 20px);
 			height: -webkit-calc(100% - 20px);
+			margin-left: 30px;
 		}
 
 		.logcontent {
@@ -1013,7 +1014,7 @@
 <%--			<a herf="https://www.baidu.com">十里桃花</a>--%>
 	<div><h4>创建词条引导</h4></div>
 	<br>
-	<div>欢迎进入创建词条引导，为便于您更好的通过审核，请务必确保您已知晓百科词条的<a href="${ctx}/baike/cmBaikeProduct/entry">编辑须知</a>，如有疑问，您可以<a>点此</a>求助采美工作人员。</div>
+	<div>欢迎进入创建词条引导，为便于您更好的通过审核，请务必确保您已知晓百科词条的<a href="${ctx}/baike/cmBaikeProduct/entry" target="_blank">编辑须知</a>，如有疑问，您可以<a>点此</a>求助采美工作人员。</div>
 	<br>
 	<div><h5>声明</h5></div>
 	<br>
@@ -1274,8 +1275,7 @@
 		<div class="control-group">
 			<label class="control-label">SEO关键词：</label>
 			<div class="auto-input">
-				<form:input path="seoKeyword" htmlEscape="false" style="position: relative" class="input-xlarge"/>
-                <label id="seoKeywordSensitiveWords" class="red"></label>
+				<form:input cssStyle="margin-left: 20px" path="seoKeyword" htmlEscape="false" style="position: relative" class="input-xlarge"/>
 			</div>
 		</div>
 		<%--关联供应商--%>

src/main/webapp/WEB-INF/views/modules/baikePage/cmBaikeProductList.jsp

@@ -38,7 +38,7 @@
 		<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 		<div class="ul-form">
 			 <label>ID：</label>
-				<form:input path="id" htmlEscape="false" class="input-medium"/>
+				<form:input path="id" maxlength="11" htmlEscape="false" class="input-medium"/>
 			 <label>词条名称：</label>
 				<form:input path="name" htmlEscape="false" maxlength="50" class="input-medium"/>
 <%--			 <label>首页置顶：</label>--%>

src/main/webapp/WEB-INF/views/modules/baikePage/cmBaikeTypeForm.jsp

@@ -144,7 +144,7 @@
 			width: 114px;
 			min-height: 80px;
 			text-align: center;
-			background: #fff;s
+			background: #fff;
 			position: relative;
 			top: 120px;
 			margin-left: 2px;

src/main/webapp/WEB-INF/views/modules/baikePage/entryGuidance.jsp

@@ -11,6 +11,6 @@
     <title>创建词条引导</title>
 </head>
 <body>
-        范德萨范德萨发生的
+        编辑须知
 </body>
 </html>

src/main/webapp/WEB-INF/views/modules/baikePage/shopBaikeProductList.jsp

@@ -121,7 +121,7 @@
 					<a href="${ctx}/baike/cmBaikeProduct/toAuditPage?id=${cmBaikeProduct.id}&commodityType=1&entryId=2"
 					   style="display: ${cmBaikeProduct.auditStatus eq 1 or cmBaikeProduct.auditStatus eq 3?'':'none'}">审核</a>
 					<a href="${ctx}/baike/cmBaikeProduct/check?id=${cmBaikeProduct.id}
-					&commodityType=1&publishSource=2">查看</a>
+					&commodityType=1&publishSource=2&entryId=2">查看</a>
 					<c:if test="${cmBaikeProduct.onlineStatus eq 2}">
 						<a href="javascript:;" onclick="offline(${cmBaikeProduct.id})">下线</a>
 					</c:if>

src/main/webapp/static/content-edit.js

@@ -334,7 +334,7 @@ class ContentEditInput {
         this.toolbar.hide()
         this.bubble = $('<div class="bk-bubble"></div>')
         this.setBubbleNum(this.options.bubbleSize)
-        this.input = $('<div class="bk-input" contenteditable="true"></div>')
+        this.input = $('<div class="bk-input" contenteditable="plaintext-only"></div>')
         this.realInput = $('<input type="text"/>')
         if (this.container.attr('name')) {
             this.realInput.attr('name', this.container.attr('name'))