Browse Source

修改支持不选择专业

lex-xin 4 years ago
parent
commit
49b4125a14

BIN
dist/app.73a7bba53d432ac04244.js.gz


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


BIN
dist/app.95ca1102bce74740d312.js.gz


File diff suppressed because it is too large
+ 0 - 0
dist/css/PaymentResult.c95af156.css


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


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


File diff suppressed because it is too large
+ 0 - 0
dist/css/SignUpPayment.4a183d6e.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/PaymentResult.162f013f.js


BIN
dist/js/PaymentResult.162f013f.js.gz


File diff suppressed because it is too large
+ 0 - 0
dist/js/PaymentResult.5e5a6a5a.js


BIN
dist/js/PaymentResult.5e5a6a5a.js.gz


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


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


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


BIN
dist/js/SignUpLevel.513ea729.js.gz


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


BIN
dist/js/SignUpPayment.3f55563f.js.gz


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


BIN
dist/js/SignUpPayment.85805e01.js.gz


+ 1 - 1
src/views/PaymentResult.vue

@@ -40,7 +40,7 @@
                 <span>考生名字:</span>
                 {{ examRegistration.studentName }}
             </p>
-            <p>
+            <p v-if="examRegistration.subjectName">
                 <span>报考专业:</span>
                 {{ examRegistration.subjectName }}({{ examRegistration.level | levelToCN }}/¥{{ examRegistration.levelFee }})
             </p>

+ 23 - 17
src/views/signup/SignUpLevel.vue

@@ -3,9 +3,9 @@
         <!-- <m-header /> -->
         <m-step :number="3" />
 
-        <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 />
+        <div class="title" v-if="examSubjectList.length > 0" >报考专业</div>
+        <van-field readonly required v-if="examSubjectList.length > 0" @click="onGetSheetList('examSubject')" name="subjectId" label="报考专业" placeholder="请选择" v-model="formText.subjectName" is-link />
+        <van-field readonly v-if="examSubjectList.length > 0" 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">
@@ -406,6 +406,7 @@ export default {
                     })
                     this.examSubjectList = tempArr
                 }
+
             } catch(err) {
                 //
             }
@@ -417,13 +418,16 @@ export default {
                 const resTheory = await getTheoryLevelList({ examId: this.examId })
                 const resultTheory = resTheory.data
                 if(resultTheory.code == 200 && resultTheory.data.length > 0) {
-                    let tempArr2 = [{
-                        id: 999,
-                        value: 999,
-                        text: "免考",
-                        level: 999,
-                        fee: 0
-                    }]
+                    let tempArr2 = []
+                    if(this.examSubjectList.length > 0) {
+                        tempArr2 = [{
+                            id: 999,
+                            value: 999,
+                            text: "免考",
+                            level: 999,
+                            fee: 0
+                        }]
+                    }
                     resultTheory.data.forEach(item => {
                         item.value = item.id
                         item.text = levelToCN[item.level]
@@ -871,14 +875,16 @@ export default {
         onCheckFields() {
             // 校验数据
             let form = this.form
-            if(!form.subjectId) {
-                this.$toast('请选择报考专业')
-                return false
-            }
+            if(this.examSubjectList.length > 0) {
+                if(!form.subjectId) {
+                    this.$toast('请选择报考专业')
+                    return false
+                }
 
-            if(!form.levelId) {
-                this.$toast('请选择专业级别')
-                return false
+                if(!form.levelId) {
+                    this.$toast('请选择专业级别')
+                    return false
+                }
             }
             // 有值说明是列表
             if(this.practiceSongIdList) {

+ 2 - 2
src/views/signup/SignUpPayment.vue

@@ -10,7 +10,7 @@
             <!-- <van-cell title="考生名字:" :border="false">
                 <template #default>{{ orderInfo.studentName }}</template>
             </van-cell> -->
-            <van-cell title="报考专业:" :border="false">
+            <van-cell v-if="orderInfo.studentNameS" title="报考专业:" :border="false">
                 <template #default>{{ orderInfo.subjectName }}</template>
             </van-cell>
             <van-cell title="乐理知识:" :border="false">
@@ -130,7 +130,7 @@ export default {
             let number = fee.value()
             const tempLevel = tempResult.examMusicTheoryLevel ? levelToCN[tempResult.examMusicTheoryLevel] + `/¥${numeral(tempResult.theoryLevelFee).format('0,0.00')}` : "免考"
             const params = {
-                studentName: tempResult.studentName,
+                studentNameS: tempResult.studentName,
                 subjectName: tempResult.subjectName + `(${levelToCN[tempResult.level]}/¥${numeral(tempResult.levelFee).format('0,0.00')})`,
                 examMusicTheoryLevel: tempLevel,
                 examStartTime: dayjs(tempResult.examStartTime).format("YYYY-MM-DD"),

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