瀏覽代碼

打包编译

lex-xin 5 年之前
父節點
當前提交
bf08f44949

二進制
dist/app.0034e707e80046a2b88e.js.gz


文件差異過大導致無法顯示
+ 0 - 0
dist/app.b25524c282063f4dea37.js


二進制
dist/app.b25524c282063f4dea37.js.gz


+ 1 - 1
dist/css/PayQRCode.8930ff86.css → dist/css/PayQRCode.50fe1457.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}.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}
+.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-7c63bcd8]{overflow:hidden;min-height:100vh}.payCode[data-v-7c63bcd8]{width:90%;margin:.3rem 5%;background:#fff;padding:.4rem 0}.popup-title[data-v-7c63bcd8]{padding-bottom:.2rem;text-align:center;font-size:.16rem;color:#4f4f4f;font-weight:700}.code-tips[data-v-7c63bcd8]{text-align:center;padding-top:.05rem;color:red}.popup-tips[data-v-7c63bcd8]{margin:.15rem;margin-bottom:0;padding:.1rem .12rem;font-size:.12rem;background:#ebebeb}#qrcode[data-v-7c63bcd8]{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}

文件差異過大導致無法顯示
+ 0 - 0
dist/css/PaymentResult.30cff1f8.css


文件差異過大導致無法顯示
+ 0 - 0
dist/css/PaymentResult.b98b84bc.css


文件差異過大導致無法顯示
+ 0 - 0
dist/css/SignUpAccount.9ab34cb1.css


+ 0 - 0
dist/css/SignUpLevel.98fe3879.css → dist/css/SignUpLevel.802bd020.css


文件差異過大導致無法顯示
+ 0 - 0
dist/css/SignUpPayment.90f7d3c8.css


文件差異過大導致無法顯示
+ 0 - 0
dist/index.html


文件差異過大導致無法顯示
+ 0 - 0
dist/js/PayQRCode.82f7c924.js


二進制
dist/js/PayQRCode.82f7c924.js.gz


文件差異過大導致無法顯示
+ 0 - 0
dist/js/PayQRCode.a963ab9a.js


二進制
dist/js/PayQRCode.a963ab9a.js.gz


文件差異過大導致無法顯示
+ 0 - 0
dist/js/PaymentResult.6119cb33.js


文件差異過大導致無法顯示
+ 0 - 0
dist/js/PaymentResult.cd305292.js


文件差異過大導致無法顯示
+ 0 - 0
dist/js/SignUpAccount.5a37410d.js


文件差異過大導致無法顯示
+ 0 - 0
dist/js/SignUpAccount.fa5c5241.js


文件差異過大導致無法顯示
+ 0 - 0
dist/js/SignUpPayment.5100ebbe.js


二進制
dist/js/SignUpPayment.5100ebbe.js.gz


二進制
dist/js/SignUpPayment.ef6bc0b1.js.gz


+ 45 - 73
src/views/PaymentResult.vue

@@ -1,13 +1,13 @@
 <template>
   <div class="paymentResult">
     <m-header v-if="headerStatus" :isBack="isBack" />
-    <div class="payon" v-if="pageStatus == 'ON'">
+    <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'">
+    <div class="payError" v-if="pageStatus == 'FAILED' || pageStatus == 'CLOSE' || pageStatus == 'REFUND'">
         <img src="@/assets/images/pay_error.png" alt />
         <p>支付失败</p>
         <van-button type="info" @click="onAppBack" round>返回</van-button>
@@ -20,7 +20,7 @@
         <p class="countdown">到计时{{ smsText }}秒刷新</p>
     </div>
 
-    <div class="paysuccess" v-if="pageStatus == 'SUCCESS'">
+    <div class="paySuccess" v-if="pageStatus == 'SUCCESS'">
         <div class="status">
             <img src="@/assets/images/pay_success.png" alt />
             <p>支付成功</p>
@@ -37,6 +37,7 @@
 import MHeader from "@/components/MHeader"
 import { paymentResult } from "./adapay/AdapayApi"
 import { browser } from "@/utils/common"
+import setLoading from '@/utils/loading'
 // import { stat } from 'fs'
 export default {
     name: "paymentResult",
@@ -60,90 +61,61 @@ export default {
     },
     methods: {
         pushHistory() {
-        var state = {
-            title: "title",
-            url: "#"
-        };
-        window.history.pushState(state, "title", "#");
+            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;
+        async __init() {
+            setLoading(true)
+            try {
+                let params = this.$route.query;
+                if (params.orderNo) {
+                    // 是否有订单号
+                    await paymentResult({ orderNo: params.orderNo }).then(res => {
+                        let result = res.data;
+                        if (result.code == 200) {
+                            const tempResult = result.data.examRegistrationPayment
+                            this.pageStatus = tempResult.transStatus
+                        } else {
+                            // 订单处理中
+                            this.pageStatus = "ING";
+                            this.CountDown();
+                        }
+                    });
                 } else {
-                    this.pageStatus = "ING";
-                    this.CountDown();
+                    if (params.type) {
+                        this.pageStatus = params.type;
+                    } else {
+                        this.pageStatus = "ING";
+                        this.CountDown();
+                    }
                 }
+            } catch(err) {
+                this.pageStatus = "ING";
+                this.CountDown();
             }
+            setLoading(false)
         },
         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" }));
-                }
+                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" })
-                    );
-                }
+                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/"
+                "#" + "/levelMusic"
             );
-            this.$router.push("/transfer")
-            }
+            this.$router.push("/levelMusic")
         },
         CountDown() {
             let s = 60;
@@ -166,8 +138,8 @@ export default {
 .paymentResult {
     min-height: 100vh;
 }
-.payerror,
-.payon,
+.payError,
+.payOn,
 .paying {
     padding-top: 1rem;
     img {
@@ -195,7 +167,7 @@ export default {
     height: 0.5rem;
     font-size: 0.18rem;
 }
-.paysuccess {
+.paySuccess {
     .status {
         background-color: #fff;
         text-align: center;

+ 3 - 3
src/views/adapay/PayQRCode.vue

@@ -99,8 +99,8 @@ export default {
 				paymentResult({ orderNo: orderNo }).then(res => {
 					let result = res.data
 					if(result.code == 200) {
-						let tempOrder = result.data.order
-						if(tempOrder.status != 'ING') {
+						let tempOrder = result.data.examRegistrationPayment
+						if(tempOrder.transStatus != 'ING') {
 							clearInterval(orderTimer)
 							this.onCallBackUrl(orderNo)
 						}
@@ -115,7 +115,7 @@ export default {
 		},
 		onCallBackUrl(orderNo) {
 			this.$router.replace({
-				path: '/levelMusic',
+				path: '/paymentResult',
 				query: {
 					orderNo: orderNo
 				}

+ 1 - 0
src/views/signup/SignUpAccount.vue

@@ -37,6 +37,7 @@ export default {
     name: 'signUpAccount',
 	components: { MHeader, MStep, MButton },
     data () {
+        localStorage.removeItem("Authorization")
         const query = this.$route.query
         return {
             examId: query.examId,

+ 3 - 0
src/views/signup/SignUpPayment.vue

@@ -141,6 +141,9 @@ export default {
         },
         onChangeStatus(val) {
             this.isStatus = val
+            if(this.examRegistrationId) { // 如果有注册编号则返回上一级
+                window.history.go(-1)
+            }
         },
         async onSubmit() {
             // 没有订单号说明是创建订单

部分文件因文件數量過多而無法顯示