xiongzhu 4 years ago
parent
commit
ee32b93de4

+ 1 - 1
src/main/java/com/izouma/nineth/config/Constants.java

@@ -9,7 +9,7 @@ public interface Constants {
         String ID_NO    = "^[1-9]\\d{7}((0\\d)|(1[0-2]))(([0-2]\\d)|3[0-1])\\d{3}$|^[1-9]\\d{5}[1-9]\\d{3}((0\\d)|(1[0-2]))(([0-2]\\d)|3[0-1])\\d{3}[0-9xX]$";
     }
 
-    String DEFAULT_AVATAR = "https://awesomeadmin.oss-cn-hangzhou.aliyuncs.com/image/avatar_male.png";
+    String DEFAULT_AVATAR = "https://9space-2021.oss-cn-shenzhen.aliyuncs.com/image/2021-11-26-18-49-04fkFHRAhM.jpg";
 
     String SMS_SIGN_NAME = "身份验证";
 

+ 1 - 1
src/main/nine-space/public/index.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="">
+<html lang="zh-Hans">
     <head>
         <meta charset="utf-8" />
         <meta http-equiv="X-UA-Compatible" content="IE=edge" />

+ 123 - 0
src/main/resources/static/AlipayHtml.html

@@ -0,0 +1,123 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <title>支付</title>
+    <script src="https://cdn.bootcss.com/jquery/3.4.1/jquery.min.js"></script>
+    <style>
+        html {
+            width: 100%;
+            height: 100%;
+            padding: 0;
+            margin: 0;
+            font-family: -apple-system, SF UI Text, Arial, PingFang SC, Hiragino Sans GB, Microsoft YaHei, WenQuanYi Micro Hei, sans-serif;
+            font-size: 14px;
+            font-weight: 400;
+            line-height: 1.6;
+        }
+
+        body {
+            width: 100%;
+            height: 100%;
+            padding: 0;
+            margin: 0;
+            background: #1677ff url(/static/img/zfb.png) no-repeat top;
+            background-size: 100%;
+        }
+
+        .overlay .overlay-img {
+            width: 186px;
+            height: 210px;
+            margin-right: 15px;
+        }
+
+        .overlay .overlay-text1 {
+            width: 272px;
+            font-size: 16px;
+            font-weight: bold;
+            color: rgba(255, 255, 255, 1);
+            line-height: 22px;
+            margin: 15px auto 0;
+        }
+
+        .overlay .overlay-text2 {
+            width: 272px;
+            font-size: 13px;
+            color: rgba(255, 255, 255, 1);
+            line-height: 18px;
+            margin: 15px auto 0;
+        }
+
+        .overlay {
+            position: fixed;
+            top: 0;
+            right: 0;
+            bottom: 0;
+            left: 0;
+            background: rgba(0, 0, 0, 0.7);
+            display: none;
+        }
+
+        #btn-zfb {
+            width: 80%;
+            margin: auto;
+            background: #ffffff;
+            line-height: 52px;
+            height: 52px;
+            outline: none;
+            color: #1677ff;
+            font-size: 18px;
+            letter-spacing: 3px;
+            font-weight: 400;
+            border: 1px solid transparent;
+            border-radius: 8px;
+            position: absolute;
+            top: 0;
+            bottom: 0;
+            left: 0;
+            right: 0;
+            display: none;
+        }
+    </style>
+</head>
+
+<body>
+<div class="overlay" id="overlay">
+    <div style="text-align: right"><img class="overlay-img" src="/static/img/zhifu_img_liulanqi_ios.png" alt=""/>
+    </div>
+    <div class="overlay-text1">请点击右上角,选择在默认浏览器中打开然后继续完成支付</div>
+    <div class="overlay-text2">注:由于微信限制,需要在浏览器中打开才可以完成支付宝支付</div>
+</div>
+
+<a id="link">
+    <button id="btn-zfb">打开支付宝</button>
+</a>
+<script>
+    function GetQueryString(name) {
+        var after = window.location.href.split("?")[1];
+        if (after) {
+            var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
+            var r = after.match(reg);
+            if (r != null) {
+                return decodeURIComponent(r[2]);
+            } else {
+                return null;
+            }
+        }
+    }
+
+    window.onload = function () {
+        console.log('onload');
+        if (/micromessenger/i.test(navigator.userAgent)) {
+            $('#overlay').fadeIn();
+        } else {
+            $('#btn-zfb').fadeIn();
+        }
+    }
+</script>
+</body>
+
+</html>

+ 1 - 2
src/main/resources/static/aliAuthorize.css

@@ -78,8 +78,7 @@
 .overlay .overlay-img {
     width: 186px;
     height: 210px;
-    display: block;
-    margin: 13px 28px 0 161px;
+    margin-right: 15px;
 }
 
 .overlay .overlay-text1 {

BIN
src/main/resources/static/img/browser.png


BIN
src/main/resources/static/img/zfb.png


BIN
src/main/resources/static/img/zhifu_img_liulanqi_ios.png


+ 94 - 0
src/main/resources/static/zfb.html

@@ -0,0 +1,94 @@
+<!doctype html>
+<html lang="zh-Hans">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport"
+          content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <meta name="format-detection" content="telphone=no"/>
+    <meta name="format-detection" content="email=no"/>
+    <meta name="screen-orientation" content="portrait"/>
+    <meta name="theme-color" content="#1677ff"/>
+    <title>支付宝</title>
+    <style>
+        html, body {
+            background: #1677ff;
+            background-size: 100%;
+            padding: 0;
+            margin: 0;
+            height: 100%;
+        }
+
+        .btn-zfb {
+            width: 80%;
+            margin: auto;
+            background: #ffffff;
+            line-height: 52px;
+            outline: none;
+            color: #1677ff;
+            font-size: 18px;
+            letter-spacing: 3px;
+            font-weight: 400;
+            border: 1px solid transparent;
+            border-radius: 8px;
+            display: block;
+        }
+
+        .mask {
+            background: rgba(0, 0, 0, 0.7);
+            color: #ffffff;
+            font-size: 14px;
+            position: fixed;
+            top: 10px;
+            right: 0;
+            padding: 10px 15px 10px 10px;
+            border-radius: 18px;
+            display: flex;
+            align-items: center;
+        }
+
+        .mask img {
+            width: 48px;
+            height: 48px;
+            margin-right: 10px;
+        }
+
+        .mask .desc {
+            display: inline-block;
+            line-height: 23px;
+        }
+
+        .mask .desc .highlight {
+            color: #ff9f19;
+        }
+
+        .mask:after {
+            content: "";
+            position: fixed;
+            right: 15px;
+            top: 0;
+            width: 0;
+            height: 0;
+            border-left: 10px solid transparent;
+            border-right: 10px solid transparent;
+            border-bottom: 10px solid rgba(0, 0, 0, .7);
+        }
+
+        .tip {
+            color: #ffffff;
+            font-size: 18px;
+            text-align: center;
+            letter-spacing: 3px;
+        }
+    </style>
+</head>
+<body>
+<img src="/static/img/zfb.png" style="width: 100%"/>
+<!--<button class="btn-zfb">打开支付宝</button>-->
+<div class="tip">请在浏览器中打开</div>
+<div class="mask">
+    <img src="/static/img/browser.png"/>
+    <div class="desc">请在<span class="highlight">浏览器中打开</span><br>继续完成支付</div>
+</div>
+</body>
+</html>

+ 9 - 7
src/main/resources/templates/AlipayHtml.ftlh

@@ -38,13 +38,15 @@
 
         <#if weixin>
             <van-overlay class="overlay" show>
-                <#if android>
-                    <img class="overlay-img" src="/static/img/zhifu_img_liulanqi_and.png" alt=""/>
-                <#elseif ios>
-                    <img class="overlay-img" src="/static/img/zhifu_img_liulanqi_ios.png" alt=""/>
-                <#else>
-                    <img class="overlay-img" src="/static/img/zhifu_img_liulanqi_and.png" alt=""/>
-                </#if>
+                <div style="text-align: right">
+                    <#if android>
+                        <img class="overlay-img" src="/static/img/zhifu_img_liulanqi_and.png" alt=""/>
+                    <#elseif ios>
+                        <img class="overlay-img" src="/static/img/zhifu_img_liulanqi_ios.png" alt=""/>
+                    <#else>
+                        <img class="overlay-img" src="/static/img/zhifu_img_liulanqi_and.png" alt=""/>
+                    </#if>
+                </div>
                 <#if ios>
                     <div class="overlay-text1">请点击右上角,选择“在Safari中打开”然后继续完成支付</div>
                 <#else>

+ 123 - 0
src/main/resources/templates/AlipayHtml1.ftlh

@@ -0,0 +1,123 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <title>支付</title>
+    <script src="https://cdn.bootcss.com/jquery/3.4.1/jquery.min.js"></script>
+    <style>
+        html {
+            width: 100%;
+            height: 100%;
+            padding: 0;
+            margin: 0;
+            font-family: -apple-system, SF UI Text, Arial, PingFang SC, Hiragino Sans GB, Microsoft YaHei, WenQuanYi Micro Hei, sans-serif;
+            font-size: 14px;
+            font-weight: 400;
+            line-height: 1.6;
+        }
+
+        body {
+            width: 100%;
+            height: 100%;
+            padding: 0;
+            margin: 0;
+            background: #1677ff url(/static/img/zfb.png) no-repeat top;
+            background-size: 100%;
+        }
+
+        .overlay .overlay-img {
+            width: 186px;
+            height: 210px;
+            margin-right: 15px;
+        }
+
+        .overlay .overlay-text1 {
+            width: 272px;
+            font-size: 16px;
+            font-weight: bold;
+            color: rgba(255, 255, 255, 1);
+            line-height: 22px;
+            margin: 15px auto 0;
+        }
+
+        .overlay .overlay-text2 {
+            width: 272px;
+            font-size: 13px;
+            color: rgba(255, 255, 255, 1);
+            line-height: 18px;
+            margin: 15px auto 0;
+        }
+
+        .overlay {
+            position: fixed;
+            top: 0;
+            right: 0;
+            bottom: 0;
+            left: 0;
+            background: rgba(0, 0, 0, 0.7);
+            display: none;
+        }
+
+        #btn-zfb {
+            width: 80%;
+            margin: auto;
+            background: #ffffff;
+            line-height: 52px;
+            height: 52px;
+            outline: none;
+            color: #1677ff;
+            font-size: 18px;
+            letter-spacing: 3px;
+            font-weight: 400;
+            border: 1px solid transparent;
+            border-radius: 8px;
+            position: absolute;
+            top: 0;
+            bottom: 0;
+            left: 0;
+            right: 0;
+            display: none;
+        }
+    </style>
+</head>
+
+<body>
+<div class="overlay" id="overlay">
+    <div style="text-align: right"><img class="overlay-img" src="/static/img/zhifu_img_liulanqi_ios.png" alt=""/>
+    </div>
+    <div class="overlay-text1">请点击右上角,选择在默认浏览器中打开然后继续完成支付</div>
+    <div class="overlay-text2">注:由于微信限制,需要在浏览器中打开才可以完成支付宝支付</div>
+</div>
+
+<a id="link" href="${href}">
+    <button id="btn-zfb">打开支付宝</button>
+</a>
+<script>
+    function GetQueryString(name) {
+        var after = window.location.href.split("?")[1];
+        if (after) {
+            var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
+            var r = after.match(reg);
+            if (r != null) {
+                return decodeURIComponent(r[2]);
+            } else {
+                return null;
+            }
+        }
+    }
+
+    window.onload = function () {
+        console.log('onload');
+        if (/micromessenger/i.test(navigator.userAgent)) {
+            $('#overlay').fadeIn();
+        } else {
+            $('#btn-zfb').fadeIn();
+        }
+    }
+</script>
+</body>
+
+</html>