瀏覽代碼

访客通行PC,微信bug处理

黄勇成 2 年之前
父節點
當前提交
787ea6c67b

+ 2 - 2
src/main/webapp/WEB-INF/pages/admin/visitor/visitorOrderInfoList.jsp

@@ -54,7 +54,7 @@
 					</div>
 				</c:if>
 				<c:if test="${fn:length(orgs) == 1}">
-					<input type="hidden" name="orgId" id="orgId" value="${orgs[0].id}" org__id="${orgs[0].id}"
+					<input type="hidden" name="orgId" id="orgId" value="${orgs[0].name}" org__id="${orgs[0].id}"
 						class="single-orgid default-select">
 				</c:if>
 				<div class="filter-name part-wp">
@@ -110,7 +110,7 @@
 <script type="text/html" id="indexTpl">
 	{{d.LAY_TABLE_INDEX+1}}
 </script>
-<script type="text/javascript" src="<c:url value='/scripts/admin/visitor/visitorOrderInfoList.js?v=20220511.10'/>"></script>
+<script type="text/javascript" src="<c:url value='/scripts/admin/visitor/visitorOrderInfoList.js?v=20220614.1'/>"></script>
 
 
 </html>

+ 1 - 0
src/main/webapp/WEB-INF/pages/wechat/visitordetails.jsp

@@ -184,6 +184,7 @@
 			let userId = sessionStorage.getItem("userId");
 			let state = sessionStorage.getItem("state");
 			let userToken = sessionStorage.getItem("userToken");
+			sessionStorage.setItem('isList', 1);
 			location.href = $("#ctx").val() + "/wechat/visitor/authorVisitor?userId=" + userId + "&openId=" + openId + "&orgId=" + orgId + "&state=" + state + "&userToken=" + userToken + "&developId=" + developId;
 		})
 

+ 3 - 1
src/main/webapp/WEB-INF/pages/wechat/visitorlist.jsp

@@ -31,6 +31,7 @@
 		let strState = getUrlParam('state');
 		let strUserToken = getUrlParam('userToken');
 		let isForm = sessionStorage.getItem('isFrom') || 0
+		let isList = sessionStorage.getItem('isList') || 0
 
 		if (strOpenId) {
 			sessionStorage.setItem('openId',strOpenId)
@@ -79,7 +80,8 @@
 //			}
             $("#addVisitorform").submit();
 		});
-		if (isForm == 1) {
+
+		if (isForm == 1&&isList == 0) {
 			$("#addVisitorform").submit();
 		} else {
 			$("#divContent").show();

+ 3 - 3
src/main/webapp/scripts/admin/visitor/visitorOrderInfoList.js

@@ -232,7 +232,7 @@ $(function () {
 								</div>\
 							</div>\
 						<%}else if(orgList!=null&&orgList.length==1){%>\
-							<input type="hidden" class="meal-select organ-id sin_org" id="orgId" value="<%=orgList[0].id %>" org__id="<%=orgList[0].id %>"/>\
+							<input type="hidden" class="meal-select organ-id sin_org" id="orgId" value="<%=orgList[0].name%>" org__id="<%=orgList[0].id %>"/>\
 						<%}%>\
 						<div class="view-flex">\
 							<div class="plan-title">请选择通行方案:</div>\
@@ -423,7 +423,7 @@ $(function () {
 			</div>	',
 		"visitorCodeTpl": '<div class="dialog-wp">\
 				<div class="mask"></div>\
-				<div class="dialog dialog-print-con">\
+				<div class="dialog">\
 					<div class="title-wp">\
 						<span>访客预约码</span>\
 						<span class="close-btn"></button>\
@@ -431,7 +431,7 @@ $(function () {
 					<div class=" dialog-print-wp "  >\
 					   <div class="base-title" style="text-align: center;margin-bottom: 20px;"><%=orgName%></div>\
 					   <div class="print-item">\
-							<div class="p-i-tip">链接:</div>\
+							<div class="p-i-tip" style="width: 50px;flex: 0 0 60px;">链接:</div>\
 							<div class="p-i-con">\
 								<span class="p-i-input p-span-url">\
 								<%=qrUrl%>\

+ 2 - 2
src/main/webapp/styles/visitor/visitorOrderInfoList.css

@@ -200,8 +200,8 @@
 .print-item .p-i-con .p-span-url{
 	float: left;
 	height: auto;
-	min-width: 50%;
-	max-width: 80%;
+	/*min-width: 50%;*/
+	/*max-width: 80%;*/
 	white-space: normal;
 	word-wrap: break-word;
 }