Преглед на файлове

Merge branch 'dev' of xiongzhu/raex_back into master

熊竹 преди 4 години
родител
ревизия
cfde40f3c9
променени са 2 файла, в които са добавени 1 реда и са изтрити 166 реда
  1. 0 165
      src/main/resources/static/AlipayHtml.html
  2. 1 1
      src/main/resources/templates/AlipayHtml.ftlh

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

@@ -1,165 +0,0 @@
-<!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: 100%;
-            margin: auto;
-            background: #ffffff;
-            line-height: 52px;
-            height: 52px;
-            outline: none;
-            color: #1677ff;
-            font-size: 18px;
-            letter-spacing: 3px;
-            font-weight: 400;
-            border-radius: 8px;
-            border: none;
-        }
-
-        #btn-zfb:active {
-            background: rgba(240, 240, 240, 1);
-        }
-
-        #btn-finish:active {
-            background: rgba(0, 0, 0, 0.03);
-        }
-
-        #btn-finish {
-            width: 100%;
-            line-height: 50px;
-            height: 52px;
-            outline: none;
-            font-size: 18px;
-            letter-spacing: 3px;
-            font-weight: 400;
-            border-radius: 8px;
-            margin: 20px auto 0 auto;
-            border: 2px solid #ffffff;
-            color: #ffffff;
-            background: none;
-        }
-
-        .btns {
-            width: 80%;
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            position: absolute;
-            left: 0;
-            right: 0;
-            top: 0;
-            bottom: 0;
-            margin: auto;
-            flex-direction: column;
-        }
-
-        .btns a {
-            width: 100%;
-        }
-    </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>
-
-<div class="btn-wrapper" style="display: none">
-    <div class="btns">
-        <a id="link">
-            <button id="btn-zfb">打开支付宝</button>
-        </a>
-        <a id="">
-            <button id="btn-finish">我已完成支付</button>
-        </a>
-    </div>
-</div>
-<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-wrapper').fadeIn();
-        }
-    }
-</script>
-</body>
-
-</html>

+ 1 - 1
src/main/resources/templates/AlipayHtml.ftlh

@@ -155,7 +155,7 @@
         $.get('/order/${orderId}/status', function (data) {
             console.log(data);
             if (data.status !== 'NOT_PAID') {
-                window.location = '/9th/orders';
+                window.location = '/9th/orderDetail?id=${orderId}';
             }
         });
     }, 1000);