lex-xin 5 年之前
父节点
当前提交
2ed2e3280e
共有 2 个文件被更改,包括 2 次插入59 次删除
  1. 0 34
      public/orderpay.html
  2. 2 25
      src/views/Home.vue

+ 0 - 34
public/orderpay.html

@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
-    </head>
-  <body>
-    <!-- built files will be auto injected -->
-    <form role="form" method="post" action="" id="onSubmits">
-        <input type="hidden" name="apiContent" id="apiContents">
-        <input type="hidden" name="merNo" id="merNos">
-        <input type="hidden" name="notifyUrl" id="notifyUrls">
-        <input type="hidden" name="sign" id="signs">
-        <input type="hidden" name="signType" id="signTypes">
-        <input type="hidden" name="timestamp" id="timestamps">
-        <input type="hidden" name="version" id="versions">
-    </form>
-    <script>
-        var orderList = sessionStorage.getItem('orderForm')
-        var f = JSON.parse(orderList)
-        sessionStorage.removeItem('orderForm')
-        document.querySelector('#onSubmits').action = f.host
-        document.querySelector('#apiContents').value = f.apiContent
-        document.querySelector('#merNos').value = f.merNo
-        document.querySelector('#notifyUrls').value = f.notifyUrl
-        document.querySelector('#signs').value = f.sign
-        document.querySelector('#signTypes').value = f.signType
-        document.querySelector('#timestamps').value = f.timestamp
-        document.querySelector('#versions').value = f.version
-        document.querySelector('#onSubmits').submit()
-    </script>
-  </body>
-</html>

+ 2 - 25
src/views/Home.vue

@@ -155,16 +155,6 @@
             <protocol :proto="protocolData" @popupClose="onPopupClose"></protocol>
         </van-popup>
 
-        <van-popup v-model="orderPayStatus" position='bottom'>
-            <!-- <van-count-down :time='time' /> -->
-            <p class="countDownContent">恭喜您抢占席位成功,请您在<span style="color: #F00"><van-count-down format="ss" @finish="finished" :time='time' />秒</span>内完成支付!</p>
-            <iframe class="iframe" id="iframe" src="./orderpay.html" width="100%" height="100%" frameborder="0" scrolling='auto' seamless></iframe>
-        </van-popup>
-
-        <!-- <van-overlay :show="true" @click="show = false" >
-            <van-loading size="24px" vertical>加载中...</van-loading>
-        </van-overlay> -->
-
         <van-popup v-model="loadingOrderStatus" :close-on-click-overlay='false' class="loadingOrder">
             <van-loading size="36px" vertical  color="#14928A">{{ loadingOrderText }}</van-loading>
         </van-popup>
@@ -183,14 +173,12 @@ export default {
     components: { Protocol, Dialog, CountDown, OrderPay },
     data() {
         return {
-            time: 120 * 1000, // 倒计时时间
             loadingOrderStatus: false, // 排队中状态
             loadingOrderText: '加载中...', // 排队文案
             resultParams: '', // 提交订单参数
             clickBtnCount: true, // 点击按钮次数判定
             paymentTimers: null, // 定时器
             paymentPostCount: 0, // 请求计数
-            orderPayStatus: false, // 支付弹窗
             popupStatus: false, // 协议弹窗样式
             protocolData: {}, // 协议参数
             result: {}, // 返回结果
@@ -385,10 +373,6 @@ export default {
             axios.post('/yqpay/toPay', qs.stringify(resultParams)).then((res) => { 
                 let result = res.data
                 this.clickBtnCount = true
-                // if(!window.history && history.pushState) {
-                //     history.pushState(null, null, 'https://www.baidu.com/')
-                // }
-
                 if(result.code == 403) {
                     this.loadingOrderStatus = true
                     this.loadingOrderText = result.msg
@@ -396,8 +380,7 @@ export default {
                 } else {
                     if(result.data) {
                         this.form = result.data
-                        this.orderPayStatus = true
-                        sessionStorage.setItem('orderForm', JSON.stringify(result.data))
+                        this.onSubmit()
                     } else {
                         Dialog.alert({
                             title: '提示',
@@ -414,7 +397,6 @@ export default {
                 return false
             }
             let that = this
-            // let paymentTimers, paymentPostCount = 0
             that.paymentTimers = setInterval(() => {
                 that.paymentPostCount++
                 if(that.paymentPostCount >= 30) {
@@ -431,8 +413,7 @@ export default {
                             that.loadingOrderText = '加载中...'
                             if(result.data) {
                                 that.form = result.data
-                                that.orderPayStatus = true
-                                sessionStorage.setItem('orderForm', JSON.stringify(result.data))
+                                this.onSubmit()
                             } else {
                                 Dialog.alert({
                                     title: '提示',
@@ -446,10 +427,6 @@ export default {
             }, 1000 * 10)
             
         },
-        finished() {
-            // 倒计时结束调用
-            this.orderPayStatus = false
-        },
         onSubmit() {
             // submit 提交
             let f = this.form