Explorar el Código

修改只报乐理

lex-xin hace 4 años
padre
commit
8271346764
Se han modificado 39 ficheros con 50 adiciones y 44 borrados
  1. 0 0
      dist/app.98eaa2cfcdab7d4c4cf1.js
  2. BIN
      dist/app.98eaa2cfcdab7d4c4cf1.js.gz
  3. 0 0
      dist/app.ed66f36e02669549cef1.js
  4. BIN
      dist/app.ed66f36e02669549cef1.js.gz
  5. 0 0
      dist/css/AppDetail.2dfa2d8c.css
  6. 0 0
      dist/css/AppDetail.c1787db8.css
  7. 0 1
      dist/css/AppRecord.3e3d7317.css
  8. 1 0
      dist/css/AppRecord.c3241b58.css
  9. 1 0
      dist/css/ExamRecord.4ccc1b41.css
  10. 0 1
      dist/css/ExamRecord.a853799a.css
  11. 0 0
      dist/css/PaymentResult.fa1dc97b.css
  12. 0 0
      dist/css/SignUpLevel.3a3950b4.css
  13. 0 0
      dist/css/SignUpLevel.e5c0d755.css
  14. 0 0
      dist/index.html
  15. 0 0
      dist/js/AppDetail.296d1bb0.js
  16. BIN
      dist/js/AppDetail.296d1bb0.js.gz
  17. 0 0
      dist/js/AppDetail.60a870c2.js
  18. BIN
      dist/js/AppDetail.60a870c2.js.gz
  19. 0 0
      dist/js/AppRecord.64fdd551.js
  20. BIN
      dist/js/AppRecord.64fdd551.js.gz
  21. BIN
      dist/js/AppRecord.aee11b6e.js.gz
  22. 0 0
      dist/js/ExamRecord.9fecf036.js
  23. 0 0
      dist/js/ExamRecord.e4987fa9.js
  24. 0 0
      dist/js/PayDefine~PayResult~PaymentResult~SignUpPayment.6bfe18e6.js
  25. BIN
      dist/js/PayDefine~PayResult~PaymentResult~SignUpPayment.6bfe18e6.js.gz
  26. BIN
      dist/js/PayDefine~PayResult~SignUpPayment.6302abeb.js.gz
  27. 0 0
      dist/js/PaymentResult.5e5a6a5a.js
  28. BIN
      dist/js/PaymentResult.5e5a6a5a.js.gz
  29. 0 0
      dist/js/PaymentResult.8d150713.js
  30. BIN
      dist/js/PaymentResult.8d150713.js.gz
  31. 0 0
      dist/js/SignUpLevel.b6d9ea7e.js
  32. BIN
      dist/js/SignUpLevel.b6d9ea7e.js.gz
  33. 0 0
      dist/js/SignUpLevel.c4006214.js
  34. BIN
      dist/js/SignUpLevel.c4006214.js.gz
  35. 4 1
      src/views/PaymentResult.vue
  36. 1 1
      src/views/app/AppDetail.vue
  37. 1 1
      src/views/app/AppRecord.vue
  38. 1 1
      src/views/app/ExamRecord.vue
  39. 41 38
      src/views/signup/SignUpLevel.vue

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/app.98eaa2cfcdab7d4c4cf1.js


BIN
dist/app.98eaa2cfcdab7d4c4cf1.js.gz


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/app.ed66f36e02669549cef1.js


BIN
dist/app.ed66f36e02669549cef1.js.gz


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/css/AppDetail.2dfa2d8c.css


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/css/AppDetail.c1787db8.css


+ 0 - 1
dist/css/AppRecord.3e3d7317.css

@@ -1 +0,0 @@
-.appRecord[data-v-4b6039f4]{height:100vh;overflow-y:auto;overflow-x:hidden}[data-v-4b6039f4] .van-cell{padding:14px 16px;font-size:16px;color:#333}[data-v-4b6039f4] .van-cell .van-cell__value{width:40%;text-align:left;-webkit-box-flex:1;-ms-flex:auto;flex:auto;color:#999}[data-v-4b6039f4] .van-cell .payTime{color:#ff3535}.section[data-v-4b6039f4]{margin-top:10px}.van-button--default[data-v-4b6039f4]{border:0;color:#2dc7aa;font-size:15px;height:.5rem;line-height:.52rem}.van-button--primary[data-v-4b6039f4]{margin:.35rem 0 .1rem;background-color:#2dc7aa;border:1px solid #2dc7aa;color:#fff;font-size:.18rem;height:.5rem;line-height:.52rem;width:90%;margin-left:5%}[data-v-4b6039f4] .van-tabs__content{background-color:#f3f4f8}.noPass .van-field__control[data-v-4b6039f4]:disabled,.noPass[data-v-4b6039f4]{color:#ff3535}.pass .van-field__control[data-v-4b6039f4]:disabled,.pass[data-v-4b6039f4]{color:#2dc7aa}.custom-image[data-v-4b6039f4]{padding-top:.8rem}.custom-image[data-v-4b6039f4] .van-empty__image{width:1.8rem;height:1.88rem}.custom-image[data-v-4b6039f4] .van-empty__description{color:#999}

+ 1 - 0
dist/css/AppRecord.c3241b58.css

@@ -0,0 +1 @@
+.appRecord[data-v-43d2ec5e]{height:100vh;overflow-y:auto;overflow-x:hidden}[data-v-43d2ec5e] .van-cell{padding:14px 16px;font-size:16px;color:#333}[data-v-43d2ec5e] .van-cell .van-cell__value{width:40%;text-align:left;-webkit-box-flex:1;-ms-flex:auto;flex:auto;color:#999}[data-v-43d2ec5e] .van-cell .payTime{color:#ff3535}.section[data-v-43d2ec5e]{margin-top:10px}.van-button--default[data-v-43d2ec5e]{border:0;color:#2dc7aa;font-size:15px;height:.5rem;line-height:.52rem}.van-button--primary[data-v-43d2ec5e]{margin:.35rem 0 .1rem;background-color:#2dc7aa;border:1px solid #2dc7aa;color:#fff;font-size:.18rem;height:.5rem;line-height:.52rem;width:90%;margin-left:5%}[data-v-43d2ec5e] .van-tabs__content{background-color:#f3f4f8}.noPass .van-field__control[data-v-43d2ec5e]:disabled,.noPass[data-v-43d2ec5e]{color:#ff3535}.pass .van-field__control[data-v-43d2ec5e]:disabled,.pass[data-v-43d2ec5e]{color:#2dc7aa}.custom-image[data-v-43d2ec5e]{padding-top:.8rem}.custom-image[data-v-43d2ec5e] .van-empty__image{width:1.8rem;height:1.88rem}.custom-image[data-v-43d2ec5e] .van-empty__description{color:#999}

+ 1 - 0
dist/css/ExamRecord.4ccc1b41.css

@@ -0,0 +1 @@
+.appRecord[data-v-3d75b0bc]{height:100vh;overflow-y:auto;overflow-x:hidden}.appRecord .container[data-v-3d75b0bc]{margin-bottom:20px}[data-v-3d75b0bc] .van-cell{padding:14px 16px;font-size:16px;color:#333}[data-v-3d75b0bc] .van-cell .van-cell__value{width:40%;text-align:left;-webkit-box-flex:1;-ms-flex:auto;flex:auto;color:#999}[data-v-3d75b0bc] .van-cell .error{color:#ff3535}[data-v-3d75b0bc] .van-cell .success{color:#2dc7aa}.section[data-v-3d75b0bc]{margin-top:10px}.van-button--default[data-v-3d75b0bc]{border:0;color:#2dc7aa;font-size:15px;height:.5rem;line-height:.52rem}[data-v-3d75b0bc] .van-button__text{display:-webkit-box;display:-ms-flexbox;display:flex}.arrow[data-v-3d75b0bc]{min-width:1em;font-size:1.2em;line-height:inherit;margin-left:5px}.custom-image[data-v-3d75b0bc]{padding-top:.8rem}.custom-image[data-v-3d75b0bc] .van-empty__image{width:1.8rem;height:1.88rem}.custom-image[data-v-3d75b0bc] .van-empty__description{color:#999}

+ 0 - 1
dist/css/ExamRecord.a853799a.css

@@ -1 +0,0 @@
-.appRecord[data-v-3c5bb488]{height:100vh;overflow-y:auto;overflow-x:hidden}.appRecord .container[data-v-3c5bb488]{margin-bottom:20px}[data-v-3c5bb488] .van-cell{padding:14px 16px;font-size:16px;color:#333}[data-v-3c5bb488] .van-cell .van-cell__value{width:40%;text-align:left;-webkit-box-flex:1;-ms-flex:auto;flex:auto;color:#999}[data-v-3c5bb488] .van-cell .error{color:#ff3535}[data-v-3c5bb488] .van-cell .success{color:#2dc7aa}.section[data-v-3c5bb488]{margin-top:10px}.van-button--default[data-v-3c5bb488]{border:0;color:#2dc7aa;font-size:15px;height:.5rem;line-height:.52rem}[data-v-3c5bb488] .van-button__text{display:-webkit-box;display:-ms-flexbox;display:flex}.arrow[data-v-3c5bb488]{min-width:1em;font-size:1.2em;line-height:inherit;margin-left:5px}.custom-image[data-v-3c5bb488]{padding-top:.8rem}.custom-image[data-v-3c5bb488] .van-empty__image{width:1.8rem;height:1.88rem}.custom-image[data-v-3c5bb488] .van-empty__description{color:#999}

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/css/PaymentResult.fa1dc97b.css


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/css/SignUpLevel.3a3950b4.css


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/css/SignUpLevel.e5c0d755.css


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/index.html


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/js/AppDetail.296d1bb0.js


BIN
dist/js/AppDetail.296d1bb0.js.gz


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/js/AppDetail.60a870c2.js


BIN
dist/js/AppDetail.60a870c2.js.gz


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/js/AppRecord.64fdd551.js


BIN
dist/js/AppRecord.64fdd551.js.gz


BIN
dist/js/AppRecord.aee11b6e.js.gz


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/js/ExamRecord.9fecf036.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/js/ExamRecord.e4987fa9.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/js/PayDefine~PayResult~PaymentResult~SignUpPayment.6bfe18e6.js


BIN
dist/js/PayDefine~PayResult~PaymentResult~SignUpPayment.6bfe18e6.js.gz


BIN
dist/js/PayDefine~PayResult~SignUpPayment.6302abeb.js.gz


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/js/PaymentResult.5e5a6a5a.js


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


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/js/PaymentResult.8d150713.js


BIN
dist/js/PaymentResult.8d150713.js.gz


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/js/SignUpLevel.b6d9ea7e.js


BIN
dist/js/SignUpLevel.b6d9ea7e.js.gz


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/js/SignUpLevel.c4006214.js


BIN
dist/js/SignUpLevel.c4006214.js.gz


+ 4 - 1
src/views/PaymentResult.vue

@@ -72,6 +72,7 @@ import { getExamRegistration } from './signup/SignUpApi'
 import { browser } from "@/utils/common"
 import setLoading from '@/utils/loading'
 import dayjs from 'dayjs'
+import numeral from 'numeral'
 // import { stat } from 'fs'
 export default {
     name: "paymentResult",
@@ -142,9 +143,11 @@ export default {
                     await paymentResult({ orderNo: params.orderNo }).then(res => {
                         let result = res.data;
                         if (result.code == 200) {
-                            const tempResult = result.data.examRegistrationPayment
+                            let tempResult = result.data.examRegistrationPayment
                             this.examRegistration = result.data.examRegistrationDto
                             this.examRegistration.examStartTime = dayjs(this.examRegistration.examStartTime).format("YYYY-MM-DD")
+                            this.examRegistration.levelFee = numeral(this.examRegistration.levelFee).format('0,0.00')
+                            tempResult.transAmount = numeral(tempResult.transAmount).format('0,0.00')
                             this.orderInfo = tempResult
                             this.pageStatus = tempResult.transStatus
                         } else {

+ 1 - 1
src/views/app/AppDetail.vue

@@ -12,7 +12,7 @@
             </van-cell>
             <van-field v-model="form.examTime" disabled label="预计考试日期" />
             <van-cell title="专业等级" >
-                {{ form.subjectName }}<span v-if="form.level || form.level == 0">({{ form.level | formatLevel }})</span>
+                {{ form.subjectName ? form.subjectName : '通用' }}<span v-if="form.level">({{ form.level | formatLevel }})</span>
             </van-cell>
             <van-cell v-for="(item, index) in practiceInfo" :key="index" :title="`练习曲${numberToCN(index)}`" @click="onOpen('practice', index)" :is-link="form.practiceSongIdList ? false : true" >
                 {{ item.songName }} {{ item.songAuthor ? '-' + item.songAuthor : item.songAuthor }}

+ 1 - 1
src/views/app/AppRecord.vue

@@ -45,7 +45,7 @@
 					<!-- <van-cell :value="item.paymentOrderNo" title="订单编号" /> -->
 					<van-cell title="专业等级">
 						<template #default>
-							{{ item.subjectName }}({{ item.level | formatLevel }})
+							{{ item.subjectName ? item.subjectName : '通用' }}<span v-if="item.level">({{ item.level | formatLevel }})</span>
 						</template>
 					</van-cell>
 					<van-cell :value="item.examTime" title="预计考试日期" />

+ 1 - 1
src/views/app/ExamRecord.vue

@@ -9,7 +9,7 @@
 						<van-cell :value="item.actualExamStartTime + '~' + item.actualExamEndTime" title="考试日期" />
 						<van-cell title="专业等级" >
 							<template #default>
-								{{ item.subjectName }}({{ item.level | formatLevel }})
+								{{ item.subjectName ? item.subjectName : '通用' }}<span v-if="item.level">({{ item.level | formatLevel }})</span>
 							</template>
 						</van-cell>
 						<!-- <transition name="fade"> -->

+ 41 - 38
src/views/signup/SignUpLevel.vue

@@ -3,47 +3,49 @@
         <!-- <m-header /> -->
         <m-step :number="3" />
 
-        <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">
-                <van-field required readonly v-for="(item, index) in practiceNum" :key="index" :label="`练习曲${numberToCN(index)}名称及作者`" v-model.trim="practiceSelect[index]" @click="onChangePractice('practice', index)" placeholder="请选择" is-link />
-            </div>
-            <div class="van-hairline--bottom" v-else key="practiceNum">
-                <van-field required readonly v-model.trim="practiceSelect[index]" v-for="(item, index) in practiceNum" :key="index" clearable name="code" :label="`练习曲${numberToCN(index)}名称及作者`" >
-                    <template #button>
-                        <span class="codeText" @click="onUploadSong('practiceNum', index)">上传曲目</span>
-                    </template>
-                </van-field>
-            </div>
+        <div v-if="examSubjectList.length > 0">
+            <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">报考曲目</div>
+            <div v-if="form.levelId" class="van-hairline--bottom">
+                <div class="van-hairline--bottom" v-if="practiceSongIdList" key="practiceNum">
+                    <van-field required readonly v-for="(item, index) in practiceNum" :key="index" :label="`练习曲${numberToCN(index)}名称及作者`" v-model.trim="practiceSelect[index]" @click="onChangePractice('practice', index)" placeholder="请选择" is-link />
+                </div>
+                <div class="van-hairline--bottom" v-else key="practiceNum">
+                    <van-field required readonly v-model.trim="practiceSelect[index]" v-for="(item, index) in practiceNum" :key="index" clearable name="code" :label="`练习曲${numberToCN(index)}名称及作者`" >
+                        <template #button>
+                            <span class="codeText" @click="onUploadSong('practiceNum', index)">上传曲目</span>
+                        </template>
+                    </van-field>
+                </div>
 
-            <div v-if="performSongIdList" key="performNum">
-                <van-field required readonly v-for="(item, index) in performNum" :key="index" :label="`演奏曲${numberToCN(index)}名称及作者`" v-model.trim="performNumSelect[index]" @click="onChangePractice('performNum', index)" placeholder="请选择" is-link />
-            </div>
-            <div v-else key="performNum">
-                <van-field required readonly v-model.trim="performNumSelect[index]" v-for="(item, index) in performNum" :key="index" clearable name="code" :label="`演奏曲${numberToCN(index)}名称及作者`" >
-                    <template #button>
-                        <span class="codeText" @click="onUploadSong('performNum', index)">上传曲目</span>
-                    </template>
-                </van-field>
+                <div v-if="performSongIdList" key="performNum">
+                    <van-field required readonly v-for="(item, index) in performNum" :key="index" :label="`演奏曲${numberToCN(index)}名称及作者`" v-model.trim="performNumSelect[index]" @click="onChangePractice('performNum', index)" placeholder="请选择" is-link />
+                </div>
+                <div v-else key="performNum">
+                    <van-field required readonly v-model.trim="performNumSelect[index]" v-for="(item, index) in performNum" :key="index" clearable name="code" :label="`演奏曲${numberToCN(index)}名称及作者`" >
+                        <template #button>
+                            <span class="codeText" @click="onUploadSong('performNum', index)">上传曲目</span>
+                        </template>
+                    </van-field>
+                </div>
             </div>
+            <!-- <div class="title">上传证书</div> -->
+            <!-- <van-field readonly clickable name="nation" label="上次考级级别" placeholder="请选择级别" is-link /> -->
+            <van-field readonly clearable name="code" label="已获最高等级专业证书" >
+                <template #input>
+                    <van-uploader
+                        name="certificate"
+                        :before-read="beforeRead"
+                        :before-delete="beforeDelete"
+                        :after-read="afterRead"
+                        accept="image/*"
+                        v-model="uploadCertificate"
+                        :max-count="1" />
+                </template>
+            </van-field>
         </div>
-        <!-- <div class="title">上传证书</div> -->
-        <!-- <van-field readonly clickable name="nation" label="上次考级级别" placeholder="请选择级别" is-link /> -->
-        <van-field readonly clearable name="code" label="已获最高等级专业证书" >
-            <template #input>
-                <van-uploader
-                    name="certificate"
-                    :before-read="beforeRead"
-                    :before-delete="beforeDelete"
-                    :after-read="afterRead"
-                    accept="image/*"
-                    v-model="uploadCertificate"
-                    :max-count="1" />
-            </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 readonly clickable name="nation" label="上次考级级别" placeholder="请选择" is-link /> -->
@@ -972,6 +974,7 @@ export default {
 @import url("../../assets/commonLess/variable");
 .signUpLevel {
     // height: 100vh;
+    min-height: calc(100vh - 1rem);
     padding-bottom: 1rem;
     overflow-y: auto;
     overflow-x: hidden;

Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio