xiongzhu 4 ani în urmă
părinte
comite
67602fc690

+ 0 - 1
src/main/nine-space/src/router/index.js

@@ -491,7 +491,6 @@ router.beforeEach((to, from, next) => {
         window.open(url);
         return;
     }
-    console.log(to);
 
     if (to.query.invitor) {
         sessionStorage.setItem('invitor', to.query.invitor);

+ 3 - 3
src/main/nine-space/src/views/Givesubmit.vue

@@ -96,7 +96,8 @@ export default {
             orderId: 0,
             gas: 1,
             showKeyboard: false,
-            inWeixin
+            inWeixin,
+            sets: false
         };
     },
     computed: {
@@ -121,7 +122,7 @@ export default {
         if (this.$route.query.id) {
             this.$http.get('/asset/get/' + this.$route.query.id).then(res => {
                 this.info = res;
-                console.log(this.info);
+                this.$toast.clear();
             });
         }
     },
@@ -132,7 +133,6 @@ export default {
                     userId: this.userInfo.id
                 })
                 .then(res => {
-                    console.log(res);
                     this.sets = res.set;
                 });
         },

+ 63 - 88
src/main/resources/templates/AlipayHtml1.ftlh

@@ -6,96 +6,67 @@
     <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%;
-        }
+    <!-- 引入样式文件 -->
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/vant@2.4/lib/index.css">
+    <link rel="stylesheet" href="/static/aliAuthorize.css">
+</head>
 
-        .overlay .overlay-img {
-            width: 186px;
-            height: 210px;
-            margin-right: 15px;
-        }
+<body>
+<#if errMsg??>
+    <div id="app" class="err">
+        <div class="err-msg"> ${errMsg}</div>
+        <div class="err-back" @click="onClickLeft">返回</div>
+    </div>
+<#else>
+    <div id="app">
 
-        .overlay .overlay-text1 {
-            width: 272px;
-            font-size: 16px;
-            font-weight: bold;
-            color: rgba(255, 255, 255, 1);
-            line-height: 22px;
-            margin: 15px auto 0;
-        }
+        <#if weixin>
+            <van-nav-bar title="收银台" @click-left="onClickLeft" style="min-height: 46px">
+                <img class="back" src="/static/img/nav_icon_return.png" slot="left" alt/>
+            </van-nav-bar>
+        </#if>
 
-        .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;
-        }
+        <div class="container">
+            <img src="/static/img/icon_shouquan.png" alt="" class="icon">
+            <div class="text">正在跳转到支付宝</div>
 
-        #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>
+            <#--        <div class="btn">-->
+            <#--            <van-button type="default" block>点击跳转到支付宝</van-button>-->
+            <#--        </div>-->
+        </div>
 
-<body>
-<div class="overlay" id="overlay">
-    <div style="text-align: right"><img class="overlay-img" src="/static/img/zhifu_img_liulanqi_ios.png" alt=""/>
+        <#if weixin>
+            <van-overlay class="overlay" show>
+                <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>
+                    <div class="overlay-text1">请点击右上角,选择“在浏览器中打开”然后继续完成支付</div>
+                </#if>
+                <div class="overlay-text2">注:由于微信限制,需要在浏览器中打开才可以完成支付宝支付</div>
+            </van-overlay>
+        </#if>
     </div>
-    <div class="overlay-text1">请点击右上角,选择在默认浏览器中打开然后继续完成支付</div>
-    <div class="overlay-text2">注:由于微信限制,需要在浏览器中打开才可以完成支付宝支付</div>
-</div>
+</#if>
+<#if !weixin && form??>
+    ${form?no_esc}
+</#if>
+<!-- 引入 Vue 和 Vant 的 JS 文件 -->
+<script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/vant@2.4/lib/vant.min.js"></script>
 
-<a id="link" href="${href}">
-    <button id="btn-zfb">打开支付宝</button>
-</a>
 <script>
+    // 在 #app 标签下渲染一个按钮组件
+
     function GetQueryString(name) {
         var after = window.location.href.split("?")[1];
         if (after) {
@@ -109,14 +80,18 @@
         }
     }
 
-    window.onload = function () {
-        console.log('onload');
-        if (/micromessenger/i.test(navigator.userAgent)) {
-            $('#overlay').fadeIn();
-        } else {
-            $('#btn-zfb').fadeIn();
+    new Vue({
+        el: '#app',
+        data: {},
+        mounted() {
+            document.getElementById('app').style.display = 'flex';
+        },
+        methods: {
+            onClickLeft: function () {
+                history.back();
+            }
         }
-    }
+    });
 </script>
 </body>