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

src/main/webapp/WEB-INF/views/modules/archive/cmOrderArchiveForm.jsp

@@ -42,11 +42,10 @@
          * jquery控制input只能输入数字
          */
         function onlynum(obj) {
-            debugger
             obj.value = obj.value.replace(/[^\d]/g, ""); //清除"数字"以外的字符
 			var orderArchiveId = $("#id").val();
 			var shopOrderId = $("#shopOrderId").val();
-			if (shopOrderId.length >= 3) {
+			if (shopOrderId.length > 0) {
 				$.post("${ctx}/archive/cmOrderArchive/checkShopOrderId",{"id":orderArchiveId,"shopOrderId":shopOrderId},function (result) {
 					if (result.code == 0) {
 						$("#clubName").val(result.clubName);
@@ -217,7 +216,7 @@
 		<div class="control-group">
 			<label class="control-label"><font color="red">*</font>子订单ID：</label>
 			<div class="controls">
-                <form:input path="shopOrderId" htmlEscape="false" maxlength="8" class="input-xlarge required" onkeyup="onlynum(this)"/>
+                <form:input path="shopOrderId" htmlEscape="false" maxlength="8" class="input-xlarge required" onblur="onlynum(this)"/>
             </div>
 		</div>
 		<div class="control-group">