Browse Source

修改显示逻辑bug

lex-xin 4 years ago
parent
commit
f2d950b09b

File diff suppressed because it is too large
+ 0 - 0
dist/app.a029a47c1a7b667beafd.js


BIN
dist/app.a029a47c1a7b667beafd.js.gz


BIN
dist/app.ba7d64c3c02dfb59f515.js.gz


File diff suppressed because it is too large
+ 0 - 0
dist/css/SignUpLevel.822444a2.css


File diff suppressed because it is too large
+ 0 - 0
dist/css/SignUpPayment.3200611b.css


File diff suppressed because it is too large
+ 0 - 0
dist/index.html


File diff suppressed because it is too large
+ 0 - 0
dist/js/SignUpLevel.3d6a0b94.js


BIN
dist/js/SignUpLevel.3d6a0b94.js.gz


File diff suppressed because it is too large
+ 0 - 0
dist/js/SignUpLevel.4a303827.js


BIN
dist/js/SignUpLevel.4a303827.js.gz


BIN
dist/js/SignUpPayment.658022cf.js.gz


File diff suppressed because it is too large
+ 0 - 0
dist/js/SignUpPayment.cbc697b6.js


BIN
dist/js/SignUpPayment.cbc697b6.js.gz


+ 12 - 5
src/views/signup/SignUpLevel.vue

@@ -77,7 +77,7 @@
             <van-picker :default-index="sheetSong.index" :columns="sheetSong.columns" show-toolbar @cancel="sheetSong.status = false" @confirm="onPracticeConfirm" />
         </van-popup>
 
-        <van-popup class="van-popup-song" v-model="songUpload.songStatus">
+        <van-popup class="van-popup-song" v-model="songUpload.songStatus" :close-on-click-overlay="false">
             <div class="song-popup">
                 <div class="title">自定义曲目</div>
                 <van-field name="songName" v-model="songUpload.name" label="曲名" placeholder="请输入曲名" >
@@ -266,11 +266,11 @@ export default {
                     if(!orderNo) {
                         return
                     }
-                    localStorage.removeItem("examRegistrationParams")
+                    // localStorage.removeItem("examRegistrationParams")
                     this.onCloseOrder(orderNo)
                 })
             } else {
-                localStorage.removeItem("examRegistrationParams")
+                // localStorage.removeItem("examRegistrationParams")
             }
         },
         async onCloseOrder(orderNo) {
@@ -710,8 +710,15 @@ export default {
         },
         onSaveCancel() {
             this.songUpload.songStatus = false
-            this.performNumUpload = this.performNumUploadTemp // 回填数据
-            this.practiceUpload = this.practiceUploadTemp // 回填数据
+            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

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

@@ -86,6 +86,7 @@ export default {
             params: params,
             payMap: {},
             isStatus: false,
+            paymentResult: null, // 点击支付存支付信息
 			payment: {}, // 支付对象
         }
     },
@@ -122,7 +123,7 @@ export default {
                     this.$toast(result.msg)
                 }
             } catch(err) {
-                //
+                // 
             }
         },
         onParse(tempResult) {
@@ -141,8 +142,9 @@ export default {
         },
         onChangeStatus(val) {
             this.isStatus = val
-            if(this.examRegistrationId) { // 如果有注册编号则返回上一级
-                window.history.go(-1)
+            if(this.paymentResult) {
+                this.orderNo = this.paymentResult.orderNo
+                this.paymentResult = null
             }
         },
         async onSubmit() {
@@ -163,6 +165,7 @@ export default {
                 let result = res.data
                 if(result.code == 200) {
                     this.payMap = result.data.payMap
+                    this.paymentResult = result.data.payMap
                     this.onSubmitPay()
                 } else {
                     this.$toast(result.msg)
@@ -180,6 +183,7 @@ export default {
                 let result = res.data
                 if(result.code == 200) {
                     this.payMap = result.data.payMap
+                    this.paymentResult = result.data.payMap
                     this.onSubmitPay()
                 } else {
                     this.$toast(result.msg)

Some files were not shown because too many files changed in this diff