Browse Source

修改文字

lex-xin 4 years ago
parent
commit
209eba9113

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


BIN
dist/app.4a237fd600648e23df6a.js.gz


BIN
dist/app.bc1beecc501b5319743d.js.gz


+ 1 - 0
dist/css/SignUp.4bf39965.css

@@ -0,0 +1 @@
+.SignUp[data-v-6b6f117a]{max-width:700px;position:relative;overflow-y:auto;overflow-x:hidden;background-color:#fff;margin:0 auto}.container[data-v-6b6f117a]{min-height:100vh;background:url(../img/signUpBg.e551d4ac.png) no-repeat top #f3f4f8;background-size:contain;overflow:hidden}.container h2[data-v-6b6f117a]{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-6b6f117a]{background:#fff;margin:2.2rem .16rem .15rem;border-radius:.1rem;padding:.22rem}.container .section .title[data-v-6b6f117a]{margin-top:.28rem;font-size:.18rem;color:#1a1a1a}.container .section .content[data-v-6b6f117a]{padding-top:.05rem;color:grey;font-size:.16rem;word-break:break-all}.container .protocol[data-v-6b6f117a]{font-size:.14rem;margin-bottom:.3rem;text-align:center;display:block;color:#0091ff}.container .van-button--primary[data-v-6b6f117a]{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%}

+ 0 - 1
dist/css/SignUp.c4f2966d.css

@@ -1 +0,0 @@
-.SignUp[data-v-4df57167]{max-width:700px;position:relative;overflow-y:auto;overflow-x:hidden;background-color:#fff;margin:0 auto}.container[data-v-4df57167]{min-height:100vh;background:url(../img/signUpBg.e551d4ac.png) no-repeat top #f3f4f8;background-size:contain;overflow:hidden}.container h2[data-v-4df57167]{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-4df57167]{background:#fff;margin:2.2rem .16rem 0;border-radius:.1rem;padding:.22rem}.container .section .title[data-v-4df57167]{margin-top:.28rem;font-size:.18rem;color:#1a1a1a}.container .section .content[data-v-4df57167]{padding-top:.05rem;color:grey;font-size:.16rem;word-break:break-all}.container .protocol[data-v-4df57167]{font-size:.14rem;margin-bottom:.3rem;text-align:center;display:block;color:#0091ff}.container .van-button--primary[data-v-4df57167]{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%}

+ 0 - 0
dist/css/SignUpAccount.9ab34cb1.css → dist/css/SignUpAccount.759c1cae.css


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


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


BIN
dist/js/PayDefine~PayQRCode~PayResult~PaymentResult~SignUp~SignUpAccount~SignUpBaseInfo~SignUpLevel~SignUpPayment.66f26990.js.gz


File diff suppressed because it is too large
+ 0 - 0
dist/js/PayDefine~PayQRCode~PayResult~PaymentResult~SignUp~SignUpAccount~SignUpBaseInfo~SignUpLevel~SignUpPayment.6916391a.js


BIN
dist/js/PayDefine~PayQRCode~PayResult~PaymentResult~SignUp~SignUpAccount~SignUpBaseInfo~SignUpLevel~SignUpPayment.6916391a.js.gz


File diff suppressed because it is too large
+ 0 - 0
dist/js/SignUp.92050db0.js


BIN
dist/js/SignUp.92050db0.js.gz


File diff suppressed because it is too large
+ 0 - 0
dist/js/SignUp.a36e00e6.js


BIN
dist/js/SignUp.a36e00e6.js.gz


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


BIN
dist/js/SignUpLevel.2756a915.js.gz


BIN
dist/js/SignUpLevel.eeb51d1c.js.gz


+ 10 - 2
src/common/axios.js

@@ -1,7 +1,7 @@
 "use strict";
 /* eslint-disable */
 import axios from "axios"
-// import router from '../router/index'
+import router from '../router/index'
 import {
   browser
 } from '@/utils/common'
@@ -66,7 +66,15 @@ _axios.interceptors.response.use(
           api: 'login'
         }))
       } else {
-        router.push('/signUpAccount')
+        const examId = window.localStorage.getItem("examId")
+        const organId = window.localStorage.getItem("organId")
+        router.replace({
+          path: 'signUpAccount',
+          query: {
+            examId: examId,
+            organId: organId
+          }
+        })
       }
     }
     return response;

+ 5 - 0
src/router/index.js

@@ -55,4 +55,9 @@ router.onError((error) => {
   }
 })
 
+const originalPush = Router.prototype.push
+Router.prototype.push = function(location) {
+  return originalPush.call(this, location).catch(err => err)
+}
+
 export default router

+ 1 - 1
src/views/signup/SignUp.vue

@@ -145,7 +145,7 @@ export default {
 	}
 	.section {
 		background: #ffffff;
-		margin: 2.2rem .16rem 0;
+		margin: 2.2rem .16rem .15rem;
 		border-radius: .1rem;
 		padding: .22rem;
 		.title {

+ 11 - 11
src/views/signup/SignUpLevel.vue

@@ -5,7 +5,7 @@
 
         <div class="title">报考专业</div>
         <van-field readonly required @click="onGetSheetList('examSubject')" name="subjectId" label="报考专业" placeholder="请选择" v-model="formText.subjectName" is-link />
-        <van-field readonly required @click="onGetSheetList('level')" name="levelId" label="报考级别" placeholder="请选择" v-model="formText.levelName" is-link />
+        <van-field readonly required @click="onGetSheetList('level')" name="levelId" label="专业级别" placeholder="请选择" v-model="formText.levelName" is-link />
         <div class="title">报考曲目</div>
         <div v-if="form.levelId" class="van-hairline--bottom">
             <div class="van-hairline--bottom" v-if="practiceSongIdList" key="practiceNum">
@@ -45,7 +45,7 @@
             </template>
         </van-field>
         <div class="title">乐理知识</div>
-        <van-field required @click="onGetSheetList('examMusicTheory')" readonly clickable name="nation" label="专业级别" v-model="formText.examMusicTheoryName" placeholder="请选择专业级别" is-link />
+        <van-field required @click="onGetSheetList('examMusicTheory')" readonly clickable name="nation" label="乐理级别" v-model="formText.examMusicTheoryName" placeholder="请选择乐理级别" is-link />
         <!-- <van-field readonly clickable name="nation" label="上次考级级别" placeholder="请选择" is-link /> -->
         <van-field readonly :required="form.examMusicTheoryId == 999 ? true : false" clearable name="code" label="上传乐理证书" >
             <template #input>
@@ -163,8 +163,8 @@ export default {
             },
             examSubjectList: [], // 报考专业
             examSubjectIndex: 0, // 报考专业选择项目索引
-            levelList: [], // 报考级别
-            levelIndex: 0, // 报考级别选择项目索引
+            levelList: [], // 专业级别
+            levelIndex: 0, // 专业级别选择项目索引
             practiceNum: 0, // 练习曲数量
             practiceSongIdList: null,
             performNum: 0, // 演奏曲数量
@@ -358,7 +358,7 @@ export default {
                     })
                     this.performNumSelectUploadList = tempPerformArr
                 }
-            }) // 获取报考级别
+            }) // 获取专业级别
 
             // 上传证书(上次考级证书)
             if(data.lastExamCertificateUrl) {
@@ -459,7 +459,7 @@ export default {
                     sheetForm.columns = this.levelList
                     sheetForm.index = this.levelIndex
                 } else {
-                    this.$toast("暂无报级别")
+                    this.$toast("暂无报专业级别")
                     return
                 }
             } else if(type == "examMusicTheory") {
@@ -468,7 +468,7 @@ export default {
                     sheetForm.columns = this.examMusicTheoryList
                     sheetForm.index = this.examMusicTheoryIndex
                 } else {
-                    this.$toast("暂无乐理专业级别")
+                    this.$toast("暂无乐理级别")
                     return
                 }
             }
@@ -487,7 +487,7 @@ export default {
                     formText.subjectName = value.name
                     this.examSubjectIndex = index
 
-                    // 清除报考级别
+                    // 清除专业级别
                     form.levelId = null
                     formText.levelName = null
                     form.examSubjectSongId = null
@@ -497,7 +497,7 @@ export default {
                     this.practiceSongIdList = null
                     this.performNum = 0 // 演奏曲数量
                     this.performSongIdList = null
-                    this.getExamSubjectLevel() // 请求报考级别
+                    this.getExamSubjectLevel() // 请求专业级别
                 }
                 sheetForm.sheetStatus = false
             } else if(sheetForm.currentType == 'level') {
@@ -843,7 +843,7 @@ export default {
             }
 
             if(!form.levelId) {
-                this.$toast('请选择报考级别')
+                this.$toast('请选择专业级别')
                 return false
             }
             // 有值说明是列表
@@ -872,7 +872,7 @@ export default {
             }
 
             if(!form.examMusicTheoryId) {
-                this.$toast('请选择乐理专业级别')
+                this.$toast('请选择乐理级别')
                 return false
             }
 

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