打包

dist/MP_verify_KdzWVtgX4eMhMsGk.txt

@@ -0,0 +1 @@
+KdzWVtgX4eMhMsGk

dist/MP_verify_VTDvJN4J1B0jmkZf.txt

@@ -0,0 +1 @@
+VTDvJN4J1B0jmkZf

dist/css/PayCenter.5360995a.css

@@ -0,0 +1 @@
+.payCenter{min-height:100vh;overflow:hidden}.error-icon{display:block;color:#ffb07b;font-size:120px;margin-bottom:.3rem}.error-text{font-size:.15rem;width:100%;text-align:center;color:#3f3f3f;margin-top:100px}

dist/css/SignUp.6931af92.css → dist/css/PayDefine.b2cc81ae.css

@@ -1 +1 @@
-.mheader[data-v-9865a7b0]{height:.44rem;overflow:hidden}.m-nav-header[data-v-9865a7b0]{position:absolute;left:0;top:0;width:100%;height:.44rem;line-height:.44rem;text-align:center;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;color:#1a1a1a;background:#fff}.m-nav-header.fixed[data-v-9865a7b0]{position:fixed;z-index:99}.m-nav-header.headerColor[data-v-9865a7b0]{background-color:#14928a;color:#fff}.m-nav-header.headerColor .m-nav-bar__title[data-v-9865a7b0]{color:#fff;font-size:.18rem}.m-nav-header .m-nav-bar__title[data-v-9865a7b0]{max-width:60%;margin:0 auto;color:#333;font-weight:500;font-size:.18rem}.m-nav-header .m-nav-bar__left[data-v-9865a7b0],.m-nav-header .m-nav-bar__right[data-v-9865a7b0]{position:absolute;bottom:0}.m-nav-header .m-nav-bar__left[data-v-9865a7b0]{left:.12rem}.m-nav-header .m-nav-bar__left .arrow-left[data-v-9865a7b0]{font-size:.21rem;vertical-align:middle}.m-nav-header .m-nav-bar__right[data-v-9865a7b0]{right:.12rem}.mbutton[data-v-26f1a8ea]{margin:.35rem 0 .2rem}.van-button--primary[data-v-26f1a8ea]{background-color:var(--main-color);border:1px solid var(--main-color);color:#fff;font-size:.18rem;height:.5rem;line-height:.52rem;width:90%;margin-left:5%}.SignUp[data-v-6c234311]{height:100vh;overflow-y:auto;overflow-x:hidden;background-color:#fff}.container[data-v-6c234311]{min-height:calc(100vh - .44rem);background:url(../img/signup_bg.ade40de2.png) no-repeat top;background-size:contain}.container .title[data-v-6c234311]{text-align:center;padding-top:.55rem}.container .title h2[data-v-6c234311]{color:#007078;font-size:.4rem;font-weight:700}.container .title p[data-v-6c234311]{color:#03838d;font-size:.18rem}.container .sign-btn[data-v-6c234311]{position:absolute;bottom:.5rem;width:100%}
+.mheader[data-v-9865a7b0]{height:.44rem;overflow:hidden}.m-nav-header[data-v-9865a7b0]{position:absolute;left:0;top:0;width:100%;height:.44rem;line-height:.44rem;text-align:center;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;color:#1a1a1a;background:#fff}.m-nav-header.fixed[data-v-9865a7b0]{position:fixed;z-index:99}.m-nav-header.headerColor[data-v-9865a7b0]{background-color:#14928a;color:#fff}.m-nav-header.headerColor .m-nav-bar__title[data-v-9865a7b0]{color:#fff;font-size:.18rem}.m-nav-header .m-nav-bar__title[data-v-9865a7b0]{max-width:60%;margin:0 auto;color:#333;font-weight:500;font-size:.18rem}.m-nav-header .m-nav-bar__left[data-v-9865a7b0],.m-nav-header .m-nav-bar__right[data-v-9865a7b0]{position:absolute;bottom:0}.m-nav-header .m-nav-bar__left[data-v-9865a7b0]{left:.12rem}.m-nav-header .m-nav-bar__left .arrow-left[data-v-9865a7b0]{font-size:.21rem;vertical-align:middle}.m-nav-header .m-nav-bar__right[data-v-9865a7b0]{right:.12rem}.payDefine[data-v-03fc6697]{overflow:hidden;background:#fff;min-height:100vh}.amount[data-v-03fc6697]{padding:.3rem 0;font-size:.3rem;text-align:center;font-weight:600}[data-v-03fc6697] .van-cell__title,[data-v-03fc6697] .van-cell__value{-webkit-box-flex:1;-ms-flex:auto;flex:auto;font-size:.15rem;color:#4f4f4f}[data-v-03fc6697] .van-button{font-size:.16rem;width:86%;margin:.2rem auto}.error-text[data-v-03fc6697]{font-size:.15rem;width:100%;text-align:center;color:#3f3f3f;margin-top:100px}.error-icon[data-v-03fc6697]{display:block;color:#ffb07b;font-size:120px;margin-bottom:.3rem}

dist/css/PayQRCode.8930ff86.css

@@ -0,0 +1 @@
+.mheader[data-v-9865a7b0]{height:.44rem;overflow:hidden}.m-nav-header[data-v-9865a7b0]{position:absolute;left:0;top:0;width:100%;height:.44rem;line-height:.44rem;text-align:center;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;color:#1a1a1a;background:#fff}.m-nav-header.fixed[data-v-9865a7b0]{position:fixed;z-index:99}.m-nav-header.headerColor[data-v-9865a7b0]{background-color:#14928a;color:#fff}.m-nav-header.headerColor .m-nav-bar__title[data-v-9865a7b0]{color:#fff;font-size:.18rem}.m-nav-header .m-nav-bar__title[data-v-9865a7b0]{max-width:60%;margin:0 auto;color:#333;font-weight:500;font-size:.18rem}.m-nav-header .m-nav-bar__left[data-v-9865a7b0],.m-nav-header .m-nav-bar__right[data-v-9865a7b0]{position:absolute;bottom:0}.m-nav-header .m-nav-bar__left[data-v-9865a7b0]{left:.12rem}.m-nav-header .m-nav-bar__left .arrow-left[data-v-9865a7b0]{font-size:.21rem;vertical-align:middle}.m-nav-header .m-nav-bar__right[data-v-9865a7b0]{right:.12rem}.payQrCode[data-v-65cfdeca]{overflow:hidden;min-height:100vh}.payCode[data-v-65cfdeca]{width:90%;margin:.3rem 5%;background:#fff;padding:.4rem 0}.popup-title[data-v-65cfdeca]{padding-bottom:.2rem;text-align:center;font-size:.16rem;color:#4f4f4f;font-weight:700}.code-tips[data-v-65cfdeca]{text-align:center;padding-top:.05rem;color:red}.popup-tips[data-v-65cfdeca]{margin:.15rem;margin-bottom:0;padding:.1rem .12rem;font-size:.12rem;background:#ebebeb}#qrcode[data-v-65cfdeca]{background:#fff;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;min-height:250px}

dist/css/PayResult.af1155c0.css

@@ -0,0 +1 @@
+.mheader[data-v-9865a7b0]{height:.44rem;overflow:hidden}.m-nav-header[data-v-9865a7b0]{position:absolute;left:0;top:0;width:100%;height:.44rem;line-height:.44rem;text-align:center;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;color:#1a1a1a;background:#fff}.m-nav-header.fixed[data-v-9865a7b0]{position:fixed;z-index:99}.m-nav-header.headerColor[data-v-9865a7b0]{background-color:#14928a;color:#fff}.m-nav-header.headerColor .m-nav-bar__title[data-v-9865a7b0]{color:#fff;font-size:.18rem}.m-nav-header .m-nav-bar__title[data-v-9865a7b0]{max-width:60%;margin:0 auto;color:#333;font-weight:500;font-size:.18rem}.m-nav-header .m-nav-bar__left[data-v-9865a7b0],.m-nav-header .m-nav-bar__right[data-v-9865a7b0]{position:absolute;bottom:0}.m-nav-header .m-nav-bar__left[data-v-9865a7b0]{left:.12rem}.m-nav-header .m-nav-bar__left .arrow-left[data-v-9865a7b0]{font-size:.21rem;vertical-align:middle}.m-nav-header .m-nav-bar__right[data-v-9865a7b0]{right:.12rem}.payWxResult[data-v-2b906c09]{overflow:hidden;min-height:100vh}.container[data-v-2b906c09]{background:#fff;padding:.15rem 0}[data-v-2b906c09] .van-cell{padding:.12rem .16rem}[data-v-2b906c09] .van-cell__title,[data-v-2b906c09] .van-cell__value{-webkit-box-flex:1;-ms-flex:auto;flex:auto;font-size:.16rem;color:#4f4f4f}[data-v-2b906c09] .van-button{font-size:.16rem;width:86%;margin:.2rem auto}.order-loading[data-v-2b906c09]{padding:.15rem 0;margin-top:.15rem;background-color:#fff;text-align:center;font-size:.15rem}.order-loading>p[data-v-2b906c09]{margin-bottom:.15rem}[data-v-2b906c09] .van-loading__spinner{width:.5rem;height:.5rem}.error-text[data-v-2b906c09]{font-size:.15rem;width:100%;text-align:center;color:#3f3f3f;margin-top:100px}.error-icon[data-v-2b906c09]{display:block;color:#ffb07b;font-size:120px;margin-bottom:.3rem}

dist/css/SignUp.3cbb80f4.css

@@ -0,0 +1 @@
+.SignUp[data-v-0eb2d96e]{height:100vh;max-width:700px;position:relative;overflow-y:auto;overflow-x:hidden;background-color:#fff;margin:0 auto}.container[data-v-0eb2d96e]{min-height:100vh;background:url(../img/signUpBg.e551d4ac.png) no-repeat top #f3f4f8;background-size:contain;overflow:hidden}.container h2[data-v-0eb2d96e]{position:absolute;padding-top:.4rem;color:#fff;font-size:.26rem;font-weight:700;width:2.1rem;text-align:left;margin-left:.16rem}.container .section[data-v-0eb2d96e]{background:#fff;margin:2.2rem .16rem 0;border-radius:.1rem;padding:.22rem}.container .section .title[data-v-0eb2d96e]{margin-top:.28rem;font-size:.18rem;color:#1a1a1a}.container .section .content[data-v-0eb2d96e]{padding-top:.05rem;color:grey;font-size:.16rem}.container .protocol[data-v-0eb2d96e]{font-size:.14rem;margin-bottom:.3rem;text-align:center;display:block;color:#0091ff}.container .van-button--primary[data-v-0eb2d96e]{margin:.35rem 0 .1rem;background-color:var(--main-color);border:1px solid var(--main-color);color:#fff;font-size:.18rem;height:.5rem;line-height:.52rem;width:90%;margin-left:5%}

src/router/index.js

@@ -21,6 +21,15 @@ let defaultRouter = [
       description: "音乐考级",
       weight: 1 // 页面权重
     }
+  }, {
+    path: "/paymentResult",
+    name: "paymentResult",
+    component: () =>
+      import( /* webpackChunkName: "PaymentResult" */ "@/views/PaymentResult"),
+    meta: {
+      description: "支付结果",
+      weight: 2 // 页面权重
+    }
   }
 ]
 

src/views/PaymentResult.vue

@@ -0,0 +1,217 @@
+<template>
+  <div class="paymentResult">
+    <m-header v-if="headerStatus" :isBack="isBack" />
+    <div class="payon" v-if="pageStatus == 'ON'">
+        <img src="@/assets/images/pay_success.png" alt />
+        <p>支付成功</p>
+        <van-button type="info" @click="onAppBack" round>返回</van-button>
+    </div>
+
+    <div class="payerror" v-if="pageStatus == 'FAILED'">
+        <img src="@/assets/images/pay_error.png" alt />
+        <p>支付失败</p>
+        <van-button type="info" @click="onAppBack" round>返回</van-button>
+    </div>
+
+    <div class="paying" v-if="pageStatus == 'ING'">
+        <img src="@/assets/images/pay_ing.png" alt />
+        <p>订单处理中</p>
+        <van-button type="info" @click="onAppBack" round>返回</van-button>
+        <p class="countdown">到计时{{ smsText }}秒刷新</p>
+    </div>
+
+    <div class="paysuccess" v-if="pageStatus == 'SUCCESS'">
+        <div class="status">
+            <img src="@/assets/images/pay_success.png" alt />
+            <p>支付成功</p>
+            <p class="money" v-if="groupType == 'PRACTICE'">￥{{ PRACTICEPRICE }}</p>
+            <p class="money" v-else>￥{{ orderInfo.actualAmount }}</p>
+        </div>
+        <van-button type="info" @click="onAppBack" round>返回</van-button>
+    </div>
+  </div>
+</template>
+
+<script>
+/* eslint-disable */
+import MHeader from "@/components/MHeader"
+import { paymentResult } from "./adapay/AdapayApi"
+import { browser } from "@/utils/common"
+// import { stat } from 'fs'
+export default {
+    name: "paymentResult",
+    components: { MHeader },
+    data() {
+        let that = this;
+        const query = this.$route.query
+        return {
+            headerStatus: false,
+            isBack: query.isBack == "off" ? false : true, // 是否显示返回按钮
+            pageStatus: null
+        };
+    },
+    mounted() {
+        // window.localStorage.removeItem('userInfo') // 删除用户信息
+        // window.localStorage.removeItem('Authorization') // 删除用户信息
+        if (!browser().android && !browser().iPhone) {
+            this.headerStatus = true;
+        }
+        this.__init()
+    },
+    methods: {
+        pushHistory() {
+        var state = {
+            title: "title",
+            url: "#"
+        };
+        window.history.pushState(state, "title", "#");
+        },
+        __init() {
+            let params = this.$route.query;
+            // 支付成功
+            if (params.orderNo) {
+                // 是否有订单号
+                paymentResult({ orderNo: params.orderNo }).then(res => {
+                let result = res.data;
+                if (result.code == 200) {
+                } else {
+                    // 订单处理中
+                    this.pageStatus = "ING";
+                    this.CountDown();
+                }
+                // this.pageStatus = 'success'
+                });
+            } else {
+                if (params.type) {
+                    this.pageStatus = params.type;
+                } else {
+                    this.pageStatus = "ING";
+                    this.CountDown();
+                }
+            }
+        },
+        onAppBack() {
+            // app回调页面
+            if (browser().android) {
+                if (this.groupType == "PRACTICE") {
+                    // 收费网管课
+                    window.location.replace(
+                        window.location.href.toString().replace(window.location.hash, "") +
+                        "#" +
+                        "/auditionpay/1"
+                    );
+                    this.$router.push("/auditionpay/1");
+                } else {
+                    DAYA.postMessage(JSON.stringify({ api: "back" }));
+                }
+            } else if (browser().iPhone) {
+                if (this.groupType == "PRACTICE") {
+                // 收费网管课
+                    window.location.replace(
+                        window.location.href.toString().replace(window.location.hash, "") +
+                        "#" +
+                        "/auditionpay/1"
+                    );
+                    this.$router.push("/auditionpay/1");
+                } else {
+                    window.webkit.messageHandlers.DAYA.postMessage(
+                        JSON.stringify({ api: "back" })
+                    );
+                }
+            } else {
+                this.onHref()
+            }
+        },
+        onHref() {
+        // musicGroupId
+            if (this.$route.query.sporadic || this.groupType == "SPORADIC") {
+            if (this.orderInfo.organId == 42) { // 42 分部是对外考级报名
+                this.$router.replace({
+                path: "/levelApply"
+                });
+            } else {
+                this.$router.push({
+                path: "/SporadicLogin",
+                query: {
+                    id: this.$route.query.sporadic || this.orderInfo.musicGroupId
+                }
+                });
+            }
+            } else {
+            window.location.replace(
+                window.location.href.toString().replace(window.location.hash, "") +
+                "#" + "/transfer/"
+            );
+            this.$router.push("/transfer")
+            }
+        },
+        CountDown() {
+            let s = 60;
+            this.smsText = s;
+            let timer = setInterval(() => {
+                if (s <= 0) {
+                    this.__init();
+                    clearInterval(timer);
+                } else {
+                    s--;
+                    this.smsText = s;
+                }
+            }, 1000);
+        }
+    }
+};
+</script>
+
+<style lang="less" scoped>
+.paymentResult {
+    min-height: 100vh;
+}
+.payerror,
+.payon,
+.paying {
+    padding-top: 1rem;
+    img {
+        display: block;
+        margin: 0 auto;
+        width: 1.03rem;
+        height: 1.37rem;
+    }
+    p {
+        padding-top: 0.12rem;
+        font-size: 0.18rem;
+        color: #444444;
+        text-align: center;
+        margin-bottom: 1.5rem;
+        &.countdown {
+            font-size: 0.14rem;
+            margin-bottom: 0;
+        }
+    }
+}
+.van-button {
+    width: 90%;
+    margin: 0 5% 0;
+    line-height: 0.48rem;
+    height: 0.5rem;
+    font-size: 0.18rem;
+}
+.paysuccess {
+    .status {
+        background-color: #fff;
+        text-align: center;
+        font-size: 0.16rem;
+        color: #444;
+        padding-bottom: 0.1rem;
+        margin-bottom: 0.1rem;
+        img {
+            margin-top: 0.1rem;
+            width: 0.58rem;
+            height: 0.71rem;
+        }
+        .money {
+            font-size: 0.14rem;
+            color: #f97215;
+        }
+  }
+}
+</style>

src/views/adapay/AdapayApi.js

@@ -8,4 +8,13 @@ export function executePayment (data) {
         method: 'post',
         data: qs.stringify(data)
     })
+}
+
+// 获取订单状态及订单信息
+export function paymentResult (data) {
+    return axios({
+        url: '/api-user/examOrder/paymentResult',
+        method: 'get',
+        params: data
+    })
 }

src/views/adapay/PayQRCode.vue

@@ -25,7 +25,7 @@
 // /* eslint-disable */
 import VueQr from 'vue-qr'
 import MHeader from '@/components/MHeader'
-// import { checkOrderStatus } from "@/api/student"
+import { paymentResult } from "./AdapayApi"
 // import qs from 'qs' executePayment
 // changeTwoDecimal,
 // 	getUrlCode
@@ -39,7 +39,7 @@ export default {
 	},
 	data() {
 		let query = this.$route.query
-		console.log(query)
+		// console.log(query)
 		return {
 			headerStatus: false,
 			codeRefreshStatus: false, // 是否进行刷新
@@ -79,20 +79,16 @@ export default {
 		} else {
 			// 判断是否是微信浏览器支付 并且是微信支付
 			// 微信支付
-			let { orderNo, sign, amount, orderBody, orderSubject } = this.payment
+			let { orderNo, sign, amount, orderBody, orderSubject } = this.payment.payMap
 			this.config.value = window.location.origin + '/#/payCenter?orderNo=' + orderNo + '&sign=' + sign + '&amount=' + amount + '&payType=' + this.payType + '&orderBody=' + orderBody + '&orderSubject=' + orderSubject
 			setTimeout(() => {
-				if(this.platform == 'teacher') {
-					this.getPaymentOrderTeacherStatus()
-				} else {
-					this.getPaymentOrderStatus()
-				}
+				this.getPaymentOrderStatus()
 			}, 3000)
 		}
 	},
 	methods: {
 		getPaymentOrderStatus() { // 循环查询订单
-			// let { orderNo } = this.payment
+			let { orderNo } = this.payment.payMap
 			let orderTimer = setInterval(() => {
 				// 判断是否在当前路由，如果不是则清除定时器
 				if(this.$route.name != 'payQRCode') {
@@ -100,21 +96,21 @@ export default {
 					return
 				}
 				this.orderTimer = orderTimer
-				// checkOrderStatus({ orderNo: orderNo }).then(res => {
-				// 	let result = res.data
-				// 	if(result.code == 200) {
-				// 		let tempOrder = result.data.order
-				// 		if(tempOrder.status != 'ING') {
-				// 			clearInterval(orderTimer)
-				// 			this.onCallBackUrl(orderNo)
-				// 		}
-				// 	} else {
-				// 		clearInterval(orderTimer)
-				// 		this.onCallBackUrl(orderNo)
-				// 	}
-				// }).catch(() => {
-				// 	clearInterval(orderTimer)
-				// })
+				paymentResult({ orderNo: orderNo }).then(res => {
+					let result = res.data
+					if(result.code == 200) {
+						let tempOrder = result.data.order
+						if(tempOrder.status != 'ING') {
+							clearInterval(orderTimer)
+							this.onCallBackUrl(orderNo)
+						}
+					} else {
+						clearInterval(orderTimer)
+						this.onCallBackUrl(orderNo)
+					}
+				}).catch(() => {
+					clearInterval(orderTimer)
+				})
 			}, 5000)
 		},
 		onCallBackUrl(orderNo) {

src/views/signup/SignUpApi.js

@@ -153,15 +153,6 @@ export function getExamIngOrder (data) {
     })
 }
 
-// 获取订单状态及订单信息
-export function paymentResult (data) {
-    return axios({
-        url: '/api-user/examOrder/paymentResult',
-        method: 'get',
-        params: data
-    })
-}
-
 // 获取报名信息
 export function getExamRegistration (data) {
     return axios({

src/views/signup/SignUpLevel.vue

@@ -148,6 +148,7 @@ export default {
         const examId = localStorage.getItem('examId')
         const organId = localStorage.getItem('organId')
         const examRegistrationParams = localStorage.getItem("examRegistrationParams") ? JSON.parse(localStorage.getItem("examRegistrationParams")) : null
+        localStorage.removeItem("examRegistrationParams")
         const query = this.$route.query
         return {
             examId: examId,
@@ -700,7 +701,6 @@ export default {
                     const practiceUpload = this.practiceUpload
                     this.practiceSelectUploadList.forEach(item => {
                         let tempUrl = []
-                        console.log(item)
                         practiceUpload[item.index].forEach(item => {
                             tempUrl.push(item.url)
                         })

src/views/signup/SignUpPayment.vue

@@ -169,14 +169,14 @@ export default {
             }
         },
         async onRePay() {
-            setLoading(false)
+            setLoading(true)
             // 有订单号说明重新支付
             try {
                 let res = await repay({ orderNo: this.orderNo })
                 setLoading(false)
                 let result = res.data
                 if(result.code == 200) {
-                    this.payMap = result.data
+                    this.payMap = result.data.payMap
                     this.onSubmitPay()
                 } else {
                     this.$toast(result.msg)