修改问题

src/views/PaymentResult.vue

@@ -96,6 +96,26 @@ export default {
         }
         this.__init()
         // this.pushHistory()
+
+        const that = this
+        window.addEventListener(
+            "popstate",
+            function(e) {
+                const examId = localStorage.getItem("examId")
+                const organId = localStorage.getItem("organId")
+                // window.location.replace(
+                //     window.location.href.toString().replace(window.location.hash, "") + `#/signUp?examId=${examId}&organId=${organId}`
+                // );
+                that.$router.push({
+                    path: "/signUp",
+                    query: {
+                        examId: examId,
+                        organId: organId
+                    }
+                })
+            },
+            false
+        );
     },
     methods: {
         pushHistory() {

src/views/signup/SignUpBaseInfo.vue

@@ -270,7 +270,11 @@ export default {
             }
             errorText && this.$toast(errorText)
         }
-    }
+    },
+    destroyed() {
+		this.$toast.clear()
+		this.$dialog.close()
+	}
 }
 </script>
 <style lang="less" scoped>

src/views/signup/SignUpLevel.vue

@@ -712,13 +712,6 @@ export default {
             this.songUpload.songStatus = false
             this.performNumUpload = JSON.parse(JSON.stringify(this.performNumUploadTemp)) // 回填数据
             this.practiceUpload = JSON.parse(JSON.stringify(this.practiceUploadTemp)) // 回填数据
-
-            console.log({
-                performNumUploadTemp: this.performNumUploadTemp,
-                performNumUpload: this.performNumUpload,
-                practiceUpload: this.practiceUpload,
-                practiceUploadTemp: this.practiceUploadTemp,
-            })
         },
         onSaveUpload() {
             let songUpload = this.songUpload
@@ -929,7 +922,11 @@ export default {
             }
             return tempNumber[value]
         }
-    }
+    },
+    destroyed() {
+		this.$toast.clear()
+		this.$dialog.close()
+	}
 }
 </script>
 <style lang="less" scoped>

src/views/signup/SignUpPayment.vue

@@ -142,10 +142,10 @@ export default {
         },
         onChangeStatus(val) {
             this.isStatus = val
-            if(this.paymentResult) {
-                this.orderNo = this.paymentResult.orderNo
-                this.paymentResult = null
-            }
+            // if(this.paymentResult) {
+            //     this.orderNo = this.paymentResult.orderNo
+            //     this.paymentResult = null
+            // }
         },
         async onSubmit() {
             // 没有订单号说明是创建订单
@@ -166,6 +166,11 @@ export default {
                 if(result.code == 200) {
                     this.payMap = result.data.payMap
                     this.paymentResult = result.data.payMap
+                    const orderNo = result.data.payMap.orderNo
+                    this.orderNo = orderNo
+                    const examRegistrationId = result.data.examRegister.id
+                    const origin = window.location.origin
+                    history.replaceState("", "Title", `${origin}/#/signUpPayment?orderNo=${orderNo}&examRegistrationId=${examRegistrationId}`)
                     this.onSubmitPay()
                 } else {
                     this.$toast(result.msg)
@@ -184,6 +189,11 @@ export default {
                 if(result.code == 200) {
                     this.payMap = result.data.payMap
                     this.paymentResult = result.data.payMap
+                    const orderNo = result.data.payMap.orderNo
+                    this.orderNo = orderNo
+                    const examRegistrationId = result.data.examRegister.id
+                    const origin = window.location.origin
+                    history.replaceState("", "Title", `${origin}/#/signUpPayment?orderNo=${orderNo}&examRegistrationId=${examRegistrationId}`)
                     this.onSubmitPay()
                 } else {
                     this.$toast(result.msg)