Browse Source

移动端多选题选项选择问题

KeYuan 5 years ago
parent
commit
3cf321af4e

+ 2 - 2
pom.xml

@@ -8,7 +8,7 @@
   <name>diaowen Maven Webapp</name>
   <url>https://github.com/wkeyuan/DWSurvey</url>
 
-	<repositories>
+<!--	<repositories>
 		<repository>
 			<snapshots>
 				<enabled>true</enabled>
@@ -17,7 +17,7 @@
 			<name>DWSurveyRepostiory</name>
 			<url>http://maven.dwsurvey.net:8081/repository/maven-public/</url>
 		</repository>
-	</repositories>
+	</repositories>-->
 
 	<dependencies>
 

+ 1 - 1
src/main/java/com/key/dwsurvey/action/survey/SurveyAction.java

@@ -111,7 +111,7 @@ public class SurveyAction extends ActionSupport{
 					+ request.getContextPath();
 
 	    	try{
-				String encoderContent=baseUrl+"/response!answerMobile.action?surveyId="+surveyId;
+				String encoderContent=baseUrl+"/dwsurvey/"+sid+".html";
 				ByteArrayOutputStream jpegOutputStream = new ByteArrayOutputStream();
 				BufferedImage twoDimensionImg = ZxingUtil.qRCodeCommon(encoderContent, "jpg", 7);
 				ImageIO.write(twoDimensionImg, "jpg", jpegOutputStream);

+ 2 - 2
src/main/webapp/WEB-INF/page/content/diaowen-collect/collect_1.jsp

@@ -147,10 +147,10 @@
 								<div style="padding-top: 15px;overflow: auto;clear: both;">
 								<div class="scmcSurveyTdCode">
 									<%-- <img alt="" src="${ctx }/images/style-model/secode.png" height="130" > --%>
-									<img alt="" src="${ctx }/survey!answerTD.action?surveyId=${survey.id}" height="130" >
+									<img alt="" src="${ctx }/survey!answerTD.action?sid=${survey.sid}" height="130" >
 								</div>
 								<div class="scmcRightTopRight" style="float: left ;padding-left: 30px;">
-									<a href="${ctx }/survey!answerTD.action?surveyId=${survey.id}&down" class="sbtn25 sbtn25_1">下载二维码</a>
+									<a href="${ctx }/survey!answerTD.action?sid=${survey.sid}&down" class="sbtn25 sbtn25_1">下载二维码</a>
 									<div class="scmcRightTopLeftNote" style="width: 100px;padding-top: 25px;">复制下面的问卷链接到QQ,Email等工具中直接发给被用户</div>
 								</div>
 								</div>

+ 1 - 0
src/main/webapp/WEB-INF/page/content/diaowen-design/answer-survey-m.jsp

@@ -11,6 +11,7 @@
 <link rel="stylesheet" href="${ctx }/js/plugs/jquery.mobile-1.4.5/jquery.mobile-1.4.5.min.css">
 <script type="text/javascript" src="${ctx }/js/plugs/jquery-ui-1.10.3.custom/js/jquery-1.10.1.js"></script>
 <script src="${ctx }/js/plugs/jquery.mobile-1.4.5/jquery.mobile-1.4.5.min.js"></script>
+<script type="text/javascript" src="${ctx }/js/common/common.js"></script>
 <script src="${ctx }/js/common/ans-m.js"></script>
 <link href="${ctx }/js/plugs/font-awesome-4.2.0/css/font-awesome.css" rel="stylesheet">
 

+ 2 - 1
src/main/webapp/WEB-INF/page/content/diaowen-design/answer-survey-p.jsp

@@ -12,7 +12,8 @@
 <script type="text/javascript" src="${ctx }/js/plugs/colpick-jQuery/js/colpick.js"></script>
 <link href="${ctx }/js/plugs/uploadify-v3.1/uploadify.css" rel="stylesheet" type="text/css" />
 <script type="text/javascript" src="${ctx }/js/plugs/uploadify-v3.1/jquery.uploadify-3.1.js"></script>
-<script type="text/javascript" src="${ctx }/js/dw/uploadify.js"></script><script type="text/javascript" src="${ctx }/js/common/common.js"></script><script type="text/javascript" src="${ctx }/js/common/ans-p.js"></script>
+<script type="text/javascript" src="${ctx }/js/dw/uploadify.js"></script>
+	<script type="text/javascript" src="${ctx }/js/common/common.js"></script><script type="text/javascript" src="${ctx }/js/common/ans-p.js"></script>
 <script language="javascript" type="text/javascript" src="${ctx }/js/plugs/My97DatePickerBeta/My97DatePicker/WdatePicker.js"></script>
 <link href="${ctx }/css/preview-dev.css" rel="stylesheet" type="text/css" />
 <link rel="stylesheet" href="${ctx }/js/plugs/colpick-jQuery/css/colpick.css" type="text/css"/>

+ 0 - 10
src/main/webapp/WEB-INF/page/layouts/header.jsp

@@ -14,16 +14,6 @@
 			</div>
 			<shiro:guest>
 				<div class="header_Item header_menu">
-				<ul>
-				<%--<li><a href="/" class="active dw-menu-a" id="indexMenu">首页</a></li>--%>
-				<%--<li><a href="/feature.jsp" class="dw-menu-a" id="featureMenu">功能</a></li>--%>
-				<%--<li><a href="${ctx }/survey-model.action" class="dw-menu-a">下载</a></li>--%>
-				<%--<li><a href="${ctx }/survey-model.action" class="dw-menu-a">帮助</a></li>--%>
-				<%--<li><a href="${ctx }/survey-model.action" class="dw-menu-a">GITHUB</a></li>--%>
-				<!--
-				<li><a href="http://support.diaowen.net/" class="dw-menu-a" id="helpMenu">帮助</a></li>
-				-->
-				</ul>
 				</div>
 				<div class="header_Item header_user" style="float: right;">
 					<a href="${ctx }/login.jsp" class="btn-a-1">登录</a>