czg_team/chaozhanggui
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更改跳转https bug和更换logo

Browse Source
This commit is contained in:
zhujunshuai
2023-03-02 09:44:23 +08:00
parent 90e4a33366
commit cfa3d88494
5 changed files with 340 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pluss-wap-page/src/main/java/cn/pluss/platform/controller/config/ViewResolverConfiguration.java
View File

@@ -65,6 +65,7 @@ public class ViewResolverConfiguration{
viewResolver.setSuffix(".jsp"); viewResolver.setSuffix(".jsp");
viewResolver.setContentType("text/html"); viewResolver.setContentType("text/html");
viewResolver.setOrder(2); viewResolver.setOrder(2);
viewResolver.setRedirectHttp10Compatible(false);
return viewResolver; return viewResolver;
} }

7
pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/MerchantController.java
View File

@@ -91,6 +91,7 @@ import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.mvc.support.RedirectAttributes; import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import org.springframework.web.servlet.view.RedirectView;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.Cookie; import javax.servlet.http.Cookie;
@@ -1506,6 +1507,9 @@ public class MerchantController {
} }
} }
String domain_wap = ParametersUtil.domain + "/wap"; String domain_wap = ParametersUtil.domain + "/wap";
log.info("跳转域名", domain_wap);
String APP_ID = ParametersUtil.APPID; String APP_ID = ParametersUtil.APPID;
String ali_appid = ParametersUtil.ZY_ALI_APP_ID; String ali_appid = ParametersUtil.ZY_ALI_APP_ID;
String url = "/merchant/h5pay?userAppId=" + userAppId; String url = "/merchant/h5pay?userAppId=" + userAppId;
@@ -1817,7 +1821,8 @@ public class MerchantController {
attrs.addAttribute("storeId", merchantStore.getStoreId()); attrs.addAttribute("storeId", merchantStore.getStoreId());
attrs.addAttribute("userAppId", userApp.getUserId()); attrs.addAttribute("userAppId", userApp.getUserId());
attrs.addAttribute("qrNo", qrNo); attrs.addAttribute("qrNo", qrNo);
view.setViewName("redirect:/merchant/auth"); //view.setViewName("redirect:/merchant/auth");
view.setView(new RedirectView("/merchant/auth?merchantCode" + merchantCode + "&storeId" + merchantStore.getStoreId() + "&userAppId=" + userApp.getUserId() + "&qrNo=" + qrNo, true, false));
return view; return view;
} }

BIN
pluss-wap-page/src/main/resources/static/resources/images/bg_logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 137 KiB

After

Width:  |  Height:  |  Size: 54 KiB

18
pluss-wap-page/src/main/webapp/WEB-INF/jsp/merchant/registerSuccess.jsp
View File

@@ -1,15 +1,15 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
pageEncoding="UTF-8"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<jsp:include page="../../common.jsp" /> <jsp:include page="../../common.jsp" />
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="viewport" <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
<title>注册成功</title> <title>注册成功</title>
</head> </head>
<body style="background:#f7f8fa;"> <body style="background:#f7f8fa;">
<%-- <div class="page-title tcenter bluebg white h40 white positionr">--%> <%-- <div class="page-title tcenter bluebg white h40 white positionr">--%>
<%-- <div>--%> <%-- <div>--%>
@@ -22,7 +22,8 @@
<div class="login_form ml20 mr20 mt50"> <div class="login_form ml20 mr20 mt50">
<form method="post"> <form method="post">
<div class="weui-cells weui-cells_form mt50 tcenter"> <div class="weui-cells weui-cells_form mt50 tcenter">
<div class="bg-green icon icon-66 f55 white dlblock radiusp50 padding15"> <div class="icon icon-66 f55 white dlblock radiusp50 padding15"
style="background-color: #2F87FD;">
</div> </div>
<div class="mt30"> <div class="mt30">
@@ -32,13 +33,15 @@
</form> </form>
</div> </div>
<div class="btn ml20 mr20 mr40" style="margin-top:2rem;"> <div class="btn ml20 mr20 mr40" style="margin-top:2rem;">
<a href="javascript:void(0);" id="btnOpenApp" class="weui-btn weui-btn_primary radius10 f14 pt15 pb15">已有账号，下载登录</a> <a href="javascript:void(0);" id="btnOpenApp"
class="weui-btn radius10 f14 pt15 pb15"
style="background-color: #2F87FD;">已有账号，下载登录</a>
</div> </div>
</body> </body>
<script src="https://static.jmlk.co/scripts/dist/jmlink.min.js"></script> <script src="https://static.jmlk.co/scripts/dist/jmlink.min.js"></script>
<script type="text/javascript"> <script type="text/javascript">
new JMLink({ new JMLink({
jmlink:'https://bztg6y.jglinks.cn/AAp2', jmlink: 'https://a.app.qq.com/o/simple.jsp?pkgname=uni.UNIFE6FEBF',
button: document.querySelector('a#btnOpenApp'), button: document.querySelector('a#btnOpenApp'),
autoLaunchApp: false, autoLaunchApp: false,
downloadWhenUniversalLinkFailed: true, downloadWhenUniversalLinkFailed: true,
@@ -46,4 +49,5 @@
params: {} params: {}
}); });
</script> </script>
</html> </html>

58
pluss-wap-page/src/main/webapp/WEB-INF/jsp/merchant/share.jsp
View File

@@ -1,16 +1,25 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
pageEncoding="UTF-8"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<jsp:include page="../../common.jsp" /> <jsp:include page="../../common.jsp" />
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="viewport" <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
<title>分享</title> <title>分享</title>
<style> <style>
div,body,p,span,h1,h2,h3,h4{ color:#333} div,
body,
p,
span,
h1,
h2,
h3,
h4 {
color: #333
}
input::-webkit-input-placeholder { input::-webkit-input-placeholder {
font-family: Avenir, Helvetica, Arial, sans-serif; font-family: Avenir, Helvetica, Arial, sans-serif;
/* placeholder颜色 */ /* placeholder颜色 */
@@ -20,13 +29,16 @@
font-size: 18px; font-size: 18px;
/* placeholder位置 */ /* placeholder位置 */
} }
input { input {
border: none; border: none;
border-bottom: 1px solid #000 border-bottom: 1px solid #000
} }
.mr40 { .mr40 {
margin-top: 40px; margin-top: 40px;
} }
.bg-logo { .bg-logo {
height: 8rem; height: 8rem;
width: 100%; width: 100%;
@@ -35,15 +47,18 @@
background-position: center 0; background-position: center 0;
background-image: url('${resourcePath}/images/bg_logo.png'); background-image: url('${resourcePath}/images/bg_logo.png');
} }
.kaptcha { .kaptcha {
width: 80px; width: 80px;
height: 32px; height: 32px;
} }
.weui-cells { .weui-cells {
height: 60px; height: 60px;
} }
</style> </style>
</head> </head>
<body> <body>
<div class="bg-logo"> <div class="bg-logo">
</div> </div>
@@ -57,7 +72,8 @@
<div class="weui-cell weui-cell_warn"> <div class="weui-cell weui-cell_warn">
<div class="weui-cell__hd"><span class="icon icon-90 f24"></span></div> <div class="weui-cell__hd"><span class="icon icon-90 f24"></span></div>
<div class="weui-cell__bd"> <div class="weui-cell__bd">
<input class="weui-input tleft pl10" id="phone" type="number" pattern="[0-9]*" value="weui input error" placeholder="请输入手机号码"> <input class="weui-input tleft pl10" id="phone" type="number" pattern="[0-9]*"
value="weui input error" placeholder="请输入手机号码">
</div> </div>
</div> </div>
</div> </div>
@@ -66,10 +82,12 @@
<div class="weui-cell weui-cell_warn"> <div class="weui-cell weui-cell_warn">
<div class="weui-cell__hd"><span class="icon icon-71 f24"></span></div> <div class="weui-cell__hd"><span class="icon icon-71 f24"></span></div>
<div class="weui-cell__bd"> <div class="weui-cell__bd">
<input class="weui-input tleft pl10" id="validateCode" type="text" maxlength="4" value="" placeholder="请输入图形验证码"> <input class="weui-input tleft pl10" id="validateCode" type="text" maxlength="4" value=""
placeholder="请输入图形验证码">
</div> </div>
<div class="weui-cell__bd tright"> <div class="weui-cell__bd tright">
<img src="${ctx}/kaptcha/get" onclick="refreshKaptcha(this)" class="kaptcha dlblock white f12" /> <img src="${ctx}/kaptcha/get" onclick="refreshKaptcha(this)"
class="kaptcha dlblock white f12" />
</div> </div>
</div> </div>
</div> </div>
@@ -78,10 +96,13 @@
<div class="weui-cell weui-cell_warn"> <div class="weui-cell weui-cell_warn">
<div class="weui-cell__hd"><span class="icon icon-71 f24"></span></div> <div class="weui-cell__hd"><span class="icon icon-71 f24"></span></div>
<div class="weui-cell__bd"> <div class="weui-cell__bd">
<input class="weui-input tleft pl10" id="phoneverify" type="number" pattern="[0-9]*" value="weui input error" placeholder="请输入验证码"> <input class="weui-input tleft pl10" id="phoneverify" type="number" pattern="[0-9]*"
value="weui input error" placeholder="请输入验证码">
</div> </div>
<div class="weui-cell__bd tright"> <div class="weui-cell__bd tright">
<a href="javascript:void(0);onclick=verification()" id="obtain" class="weui-btn_primary radius5 pt10 pb10 pl10 pr10 dlblock white f12">获取验证码</a> <a href="javascript:void(0);onclick=verification()" id="obtain"
class="radius5 pt10 pb10 pl10 pr10 dlblock white f12"
style="background-color: #2F87FD;">获取验证码</a>
</div> </div>
</div> </div>
</div> </div>
@@ -89,7 +110,8 @@
<div class="weui-cell weui-cell_warn"> <div class="weui-cell weui-cell_warn">
<div class="weui-cell__hd"><span class="icon icon-31 f24"></span></div> <div class="weui-cell__hd"><span class="icon icon-31 f24"></span></div>
<div class="weui-cell__bd"> <div class="weui-cell__bd">
<input class="weui-input tleft pl10" type="password" id="password" maxlength="20" placeholder="请输入6~20位登录密码"> <input class="weui-input tleft pl10" type="password" id="password" maxlength="20"
placeholder="请输入6~20位登录密码">
</div> </div>
</div> </div>
</div> </div>
@@ -97,7 +119,8 @@
<div class="weui-cell weui-cell_warn"> <div class="weui-cell weui-cell_warn">
<div class="weui-cell__hd"><span class="icon icon-31 f24"></span></div> <div class="weui-cell__hd"><span class="icon icon-31 f24"></span></div>
<div class="weui-cell__bd pl10"> <div class="weui-cell__bd pl10">
<input class="weui-input tleft" type="password" id="againPassword" maxlength="20" placeholder="请再次输入登录密码"/> <input class="weui-input tleft" type="password" id="againPassword" maxlength="20"
placeholder="请再次输入登录密码" />
</div> </div>
</div> </div>
<input type="hidden" id="inviteNum" value="${inviteNum }"> <input type="hidden" id="inviteNum" value="${inviteNum }">
@@ -112,14 +135,16 @@
</div> </div>
<div class="btn ml20 mr20 mr40"> <div class="btn ml20 mr20 mr40">
<!-- <a href="javascript:void(0);" class="weui-btn weui-btn_primary radius10 f14 pt15 pb15">推荐人:${userName}${enPhone}</a --> <!-- <a href="javascript:void(0);" class="weui-btn weui-btn_primary radius10 f14 pt15 pb15">推荐人:${userName}${enPhone}</a -->
<a href="javascript:void(0);" onclick="goreGister()" class="weui-btn weui-btn_primary radius10 f14 pt15 pb15">注册</a> <a href="javascript:void(0);" onclick="goreGister()" class="weui-btn radius10 f14 pt15 pb15"
<a href="javascript:void(0);" id="btnOpenApp" class="weui-btn weui-btn_primary radius10 f14 pt15 pb15">已有账号，下载登录</a> style="background-color: #2F87FD;">注册</a>
<a href="javascript:void(0);" id="btnOpenApp" class="weui-btn radius10 f14 pt15 pb15"
style="background-color: #2F87FD;">已有账号，下载登录</a>
</div> </div>
</body> </body>
<script src="https://static.jmlk.co/scripts/dist/jmlink.min.js"></script> <%--<script src="https://static.jmlk.co/scripts/dist/jmlink.min.js"></script>--%>
<script type="text/javascript"> <script type="text/javascript">
new JMLink({ new JMLink({
jmlink:'https://bztg6y.jglinks.cn/AAp2', jmlink: 'https://a.app.qq.com/o/simple.jsp?pkgname=uni.UNIFE6FEBF',
button: document.querySelector('a#btnOpenApp'), button: document.querySelector('a#btnOpenApp'),
autoLaunchApp: false, autoLaunchApp: false,
downloadWhenUniversalLinkFailed: true, downloadWhenUniversalLinkFailed: true,
@@ -248,4 +273,5 @@ new JMLink({
$(obj).attr("src", url + "?t=" + time); $(obj).attr("src", url + "?t=" + time);
} }
</script> </script>
</html> </html>