Sfoglia il codice sorgente

活动、邀请好友页面调整

anderx 7 anni fa
parent
commit
6a75e5bf12

+ 1 - 1
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -838,7 +838,7 @@ public class WebpageController extends BaseController {
 		
 		modelview.addObject("projects", jtBusinessProjects);
 		List<PolicyResult> policies = (List<PolicyResult>) policyService
-				.searchPolicy("", 2, null, null, "web_index", 1, 3, null).getList();
+				.searchPolicy("", 2, null, null, "web_index", 1, 99, null).getList();
 		for (PolicyResult p : policies) {
 			if (null != p.getTitleImg() && p.getTitleImg().contains(",")) {
 				p.setTitleImg(p.getTitleImg().substring(0, p.getTitleImg().indexOf(",")));

+ 39 - 36
src/main/webapp/WEB-INF/views/common.html

@@ -397,45 +397,48 @@
 		<div class="login">
 			<div class="login_mian">
 				<div class="login_left">
-					<div class="login_ewm">
-						<img th:src="${portalHost+'/img/Android.jpg'}" alt="二维码" />
-						<p>Android版</p>
-						<p>客户端</p>
-					</div>
-					<div class="login_ewm">
-						<img th:src="${portalHost+'/img/iPhone.jpg'}" alt="二维码" />
-						<p>iPhone版</p>
-						<p>客户端</p>
-					</div>
+					<a href="/user/signIn"></a>	
 				</div>
 				<div class="login_right">
-					<h5>用户登陆<a th:href="@{/user/signIn}">免费注册有好礼呦!!</a></h5>
-					<form  id="form_login">
-						<div class="login_uesr">
-							<label for="uesname"><img th:src="${portalHost+'/img/login_use.png'}"/></label>
-							<input type="text" name="uesname" id="Lo_user" placeholder="用户名" />
-							<img th:src="${portalHost+'/img/login_del.png'}" class="log_del"/>
-						</div>
-						<div class="login_pass">
-							<label for="pass"><img th:src="${portalHost+'/img/login_password.png'}"/></label>
-							<input type="password" name="pass" id="Lo_pass" autocomplete="off" placeholder="请输入密码" />
-						</div>
-						<!-- <div class="login_pass">
-							<img th:src="${portalHost+'/img/resiger_username.jpg'}" alt=""/>
-							<select id="customerType">
-								<option value="0">个人</option>
-								<option value="1">企业</option>
-							</select>
-						</div> -->
-						<div class="login_check">
-						<a href="#">忘记密码?</a>
-						</div>
-						<input type="submit" value="登 陆" class="login_submit"/>
-					</form>
-					<img th:src="${portalHost+'/img/login_hua.png'}" alt="" class="login_hua"/>
-					<img th:src="${portalHost+'/img/login_shadow.png'}" alt="阴影效果" class="login_shadow"/>
-					<img th:src="${portalHost+'/img/login_close.png'}" alt="" class="login_close"/>
+					<div class="loginB ">
+						<h5>用户登陆</h5>
+						<form id="form_login">
+							<div class="login_uesr">
+								<label for="uesname">
+									<img th:src="${portalHost+'/img/index/index_login11.png'}" />
+								</label>
+								<input type="text" name="uesname" id="Lo_user" placeholder="请输入手机号" />
+							</div>
+							<div class="login_pass">
+								<label for="pass">
+									<img th:src="${portalHost+'/img/index/index_login1122.png'}" />
+								</label>
+								<input type="password" autocomplete="off" name="pass" id="Lo_pass" placeholder="请输入密码" />
+							</div>
+							<div class="login_check">
+								<a href="" class="forgetPass">忘记密码?</a><a href="/user/signIn">点我注册</a>
+							</div>
+							<input type="submit" value="登 陆" class="login_submit" />
+						</form>
+					</div>
+					<div class="loginSelect ">
+						<h5>用户类型</h5>
+						<form class="formSelect">
+							<div class="login_uesr">
+								<label for="type1" class="active">
+								<input type="radio" name="userType" value="0" id="type1" />个人用户</label>
+							</div>
+							<div class="login_pass">
+								<label for="type2" >
+								<input type="radio" name="userType"  value="1" id="type2"/>企业用户</label>
+							</div>
+							<input type="submit" value="确 认" class="typeQren" />
+						</form>
+					</div>
 				</div>
+				
+				<img th:src="${portalHost+'/img/login_shadow.png'}" alt="阴影效果" class="login_shadow" />
+				<img th:src="${portalHost+'/img/login_close.png'}" alt="" class="login_close" />
 			</div>
 		</div>
 		<div id="forget">

+ 3 - 2
src/main/webapp/WEB-INF/views/portal/invRegister.html

@@ -15,7 +15,7 @@
 	<div th:replace="common::nav('','')"></div>
     <!-- 公共头部结束 -->
     <div class="continueHighBanner">
-        <a th:href="@{/portal/invitation}"><img th:src="${portalHost+'/img/load/invR_banner.png'}" alt=""></a>
+        <a th:href="@{/user/signIn}"><img th:src="${portalHost+'/img/load/invR_banner.png'}" alt=""></a>
     </div>
     <div class="container invRegister">
         <div class="topList">
@@ -24,11 +24,12 @@
                    <a th:href="@{'/portal/facilitatorDetails?uid='+${v.grantingUid}+'#2'}">
                    	  
                        <span th:text="'抵用券有效期:'+${v.durationDay}+'天'">2018.01.10-2018.02.20</span>
-                       <h1><span th:text="${v.money}">> 500</span><sup>优惠劵</sup></h1>
+                       <h1><span th:text="${v.money}">> 500</span><sup></sup></h1>
                        <p  th:text="${v.name}"></p>
                    </a>    
                 </li>
             </ul>
+            <a th:href="@{/portal/invitation}">了解活动规则详情 &gt;&gt;</a>
         </div>   
         <div class="invTitle">
             <h2>企业必备</h2>

File diff suppressed because it is too large
+ 28 - 9
src/main/webapp/WEB-INF/views/portal/invitation.html


+ 59 - 65
src/main/webapp/WEB-INF/views/user/signIn.html

@@ -4,7 +4,7 @@
 <head th:replace="common::header(~{::title},~{::link})">
 	<title>注册页</title>
 	<link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
-	<link th:href="${staticHost+'/dll/dll.css'}" rel="stylesheet">
+	<link th:href="${portalHost + '/dll/dll.css'}" rel="stylesheet">
 	<link th:href="${portalHost + '/register.css'}" rel="stylesheet">
 </head>
 <body>
@@ -14,73 +14,67 @@
 	<!--主体内容区域开始-->
   	  	<!--主体内容区域开始-->
   	<div class="registered">
-  		<div class="reg_con">
-			<form action="" id="form_register">
-				<div class="clear_first"></div>
-				<div class="zhuce">
-					<div class="title">用户注册</div>
-					<div class="regist">
-						<div class="zhuce_input">
-							<img th:src="${portalHost+'/img/name.jpg'}" alt=""/>
-							<input type="text" name="userName" placeholder="请输入名称"  id="username" autocomplete="off"/>
-							<img th:src="${portalHost+'/img/login_del.png'}" class="log_del"/>
-							<span class="star"> * </span>
-						</div>
-						<div class="zhuce_input">
-							<img th:src="${portalHost+'/img/pass2.jpg'}" alt=""/>
-							<input type="password" name="userPassword" placeholder="请输入密码" id="userpassword" autocomplete="off"/>
-							<span class="star"> * </span>
-						</div>
-						<div class="zhuce_input">
-							<img th:src="${portalHost+'/img/pass2.jpg'}" alt=""/>
-							<input type="password" name="userPassword2" placeholder="确认密码" id="userpassword2" autocomplete="off"/>
-							<span class="star"> * </span>
-						</div>
-						<!-- <div class="zhuce_input">
-							<img th:src="${portalHost+'/img/resiger_username.jpg'}" alt=""/>
-							<select id="customerTypes">
-								<option value="0">个人</option>
-								<option value="1">企业</option>
-							</select>
-							<span class="star"> * </span>
-						</div> -->
-						<div class="zhuce_input">
-							<img th:src="${portalHost+'/img/resiger_photo2.jpg'}" alt=""/>
-							<input type="text" name="photo" placeholder="请输入手机号码" id="usePhoto" autocomplete="off"/>
-							<span class="star"> * </span>
-						</div>						
-						<div class="cellcode">
-							<div>
-								<input type="text" name="cellCode" placeholder="手机验证码" id="photo_num"/>
-							</div>
-							<input type="button" id="photo" value="获取验证码" disabled/>
-						</div>	
-						<div class="zhuce_input">
-							<input type="text" name="beInviteCode" placeholder="请输入邀请码" id="beInviteCode" autocomplete="off"/>
-						</div>											
-						<div class="protocol">
-							<label for="protocol" class="protocol_lab cheackeds_no">
-								<input type="checkbox" name="pro" id="protocol"/>
-								<a href="javascript:;" class="head_login_">同意技淘网会员服务协议条款</a>
-							</label>
-						</div>
-						<div class="submit">
-							<input type="submit" class="sub" value="注册"/>
-						</div>
+	<div class="reg_con">
+		<form action="" method="post" id="form_register">
+			<div class="clear_first"></div>
+			<div class="zhuce">
+				<div class="picture">
+				</div>
+				<div class="regist">
+					<div class="titleUser">
+						<p >用户注册</p>
+						<p >已注册可直接<a href="javascript:;" class="head_login">登录</a></p>
 					</div>
-					<div class="picture">
-						<div class="denglu">已有账号?去 <a href="javascript:;" class="head_login">登录</a></div>
-						<a href="#" class="clear huodong">
-							<img th:src="${portalHost+'/img/huodong.jpg'}" alt=""/>
-						</a>
+					<div class="zhuce_input">
+						<img th:src="${portalHost+'/img/indedImg/enroll3.png'}" alt=""/>
+						<input type="text" name="photo" placeholder="请输入手机号码" id="usePhoto" autocomplete="off"/>
+						<span class="star"> * </span>
+						<span class="Tips "></span>
+					</div>
+					<div class="zhuce_input">
+						<img th:src="${portalHost+'/img/indedImg/enroll4.png'}" alt=""/>
+						<input type="text" name="cellCode" placeholder="手机验证码" id="photo_num" autocomplete="off" />
+						<input type="button" id="photo" value="获取验证码" disabled="disabled"/>
+						<span class="star"> * </span>
+						<span class="Tips"></span>
+					</div>
+					<div class="zhuce_input">
+						<img th:src="${portalHost+'/img/indedImg/enroll6.png'}" alt=""/>
+						<input type="password" name="userPassword" placeholder="请输入密码" id="userpassword" autocomplete="off"/>
+						<span class="star"> * </span>
+						<span class="Tips"></span>
+					</div>
+					<div class="zhuce_input">
+						<img th:src="${portalHost+'/img/indedImg/enroll6.png'}" alt=""/>
+						<input type="password" name="userPassword2" placeholder="确认密码" id="userpassword2" autocomplete="off"/>
+						<span class="star"> * </span>
+						<span class="Tips"></span>
+					</div>
+					<div class="zhuce_input">
+						<img th:src="${portalHost+'/img/indedImg/enroll3.png'}" alt=""/>
+						<input type="text" name="userName" placeholder="请输入用户名"  id="username" autocomplete="off"/>
+						<span class="star"> * </span>
+						<span class="Tips"></span>
+					</div>
+					<div class="zhuce_input">
+						<img th:src="${portalHost+'/img/indedImg/enroll9.png'}" alt=""/>
+						<input type="text" name="beInviteCode" placeholder="请输入邀请码" id="beInviteCode" autocomplete="off">
+					</div>
+					<div class="protocol">
+						<label for="protocol" class="cheackeds_no">
+							<input type="checkbox" name="pro" id="protocol"/>
+							<a href="javascript:;" class="head_login_">同意技淘网会员服务协议条款</a>
+						</label>
+					</div>
+					<div class="submit">
+						<input type="submit" class="sub" value="注册"/>
 					</div>
 				</div>
-				<div class="shadow">
-					<img th:src="${portalHost+'/img/shadow7.png'}" alt=""/>
-				</div>
-			</form>
-		</div>
-  	</div>
+				
+			</div>
+		</form>
+	</div>
+</div>
   	<div class="login_">
 		<div class="login_main_">
 			<h3 class="title_">免责声明 DISCLAIMER</h3>