Browse Source

重新打包修改bug

lex-xin 4 years ago
parent
commit
864fc5b134

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


BIN
dist/app.1382a202b8932f8073ba.js.gz


BIN
dist/app.a92e3c5f37db0249ef5a.js.gz


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

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

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

File diff suppressed because it is too large
+ 0 - 0
dist/css/SignUpBaseInfo.51923d22.css


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


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


BIN
dist/js/SignUp.2bba6cbe.js.gz


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


BIN
dist/js/SignUp.2d8876e9.js.gz


File diff suppressed because it is too large
+ 0 - 0
dist/js/SignUpBaseInfo.0e244f90.js


BIN
dist/js/SignUpBaseInfo.0e244f90.js.gz


File diff suppressed because it is too large
+ 0 - 0
dist/js/SignUpBaseInfo.c5cf1b1d.js


BIN
dist/js/SignUpBaseInfo.c5cf1b1d.js.gz


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


BIN
dist/js/SignUpLevel.17abce65.js.gz


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


BIN
dist/js/SignUpLevel.9531fa14.js.gz


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

@@ -159,6 +159,7 @@ export default {
 			padding-top: .05rem;
 			color: #808080;
 			font-size: .16rem;
+			word-break: break-all;
 		}
 	}
 

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

@@ -115,8 +115,8 @@ export default {
                         title: '提示',
                         message: "您有待支付订单",
                         confirmButtonColor: '#269a93',
-                        cancelButtonText: '已完成支付',
-                        confirmButtonText: '重新下单'
+                        cancelButtonText: '取消订单',
+                        confirmButtonText: '去支付'
                     }).then(() => {
                         this.$router.push({
                             path: '/signUpPayment',

+ 20 - 16
src/views/signup/SignUpLevel.vue

@@ -6,9 +6,8 @@
         <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 v-if="form.levelId">
-            <div class="title">报考曲目</div>
-
+        <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>
@@ -31,9 +30,9 @@
                 </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="上次考级证书" >
+        <!-- <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"
@@ -48,7 +47,7 @@
         <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 /> -->
-        <van-field readonly :required="form.examMusicTheoryId == 999 ? true : false" clearable name="code" label="上次考级证书" >
+        <van-field readonly :required="form.examMusicTheoryId == 999 ? true : false" clearable name="code" label="上次乐理证书" >
             <template #input>
                 <van-uploader
                     name="certificate2"
@@ -474,6 +473,11 @@ export default {
                 this.performNum = value.performNum
                 this.performSongIdList = value.performSongIdList
                 sheetForm.sheetStatus = false
+
+                this.practiceSelect = []
+                this.practiceUpload = []
+                this.performNumSelect = []
+                this.performNumUpload = []
                 this.getExamSubjectSong()
             } else if(sheetForm.currentType == "examMusicTheory") {
                 form.examMusicTheoryId = value.value
@@ -659,21 +663,21 @@ export default {
             }
             const nameAuthor = songUpload.name + (songUpload.author ? "-" + songUpload.author : "")
             if(songUpload.indexName == "practiceNum") {
-                if(!this.practiceUpload[songUpload.index]) {
-                    this.$toast("请上传文件")
-                    return
-                } else {
+                if(this.practiceUpload[songUpload.index] && this.practiceUpload[songUpload.index].url) {
                     this.practiceSelect[songUpload.index] = nameAuthor
                     this.practiceSelectUploadList[songUpload.index] = JSON.parse(JSON.stringify(songUpload))
-                }
-            } else if(songUpload.indexName == "performNum") {
-                if(!this.performNumUpload[songUpload.index]) {
+                } else {
                     this.$toast("请上传文件")
                     return
-                } else {
+                }
+            } else if(songUpload.indexName == "performNum") {
+                if(this.performNumUpload[songUpload.index] && this.performNumUpload[songUpload.index].url) {
                     this.performNumSelect[songUpload.index] = nameAuthor
                     this.performNumSelectUploadList[songUpload.index] = JSON.parse(JSON.stringify(songUpload))
-                }
+                } else {
+                    this.$toast("请上传文件")
+                    return
+                } 
             }
             songUpload.name = null
             songUpload.author = null

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