lex-xin 4 years ago
parent
commit
d22affa6b0
36 changed files with 24 additions and 36 deletions
  1. 0 0
      dist/app.0c13bcec2c56818ff4ee.js
  2. BIN
      dist/app.0c13bcec2c56818ff4ee.js.gz
  3. BIN
      dist/app.5a1f519c18ac2a6813ed.js.gz
  4. 0 0
      dist/css/AppDetail.9760102a.css
  5. 0 0
      dist/css/AppDetail.c819930b.css
  6. 1 0
      dist/css/SignUp.1c4fcb4b.css
  7. 0 1
      dist/css/SignUp.df7bbcf3.css
  8. 0 0
      dist/css/SignUpLevel.c15aafc1.css
  9. 0 0
      dist/index.html
  10. 0 0
      dist/js/AppDetail.13659b5f.js
  11. BIN
      dist/js/AppDetail.13659b5f.js.gz
  12. 0 0
      dist/js/AppDetail.7d461574.js
  13. BIN
      dist/js/AppDetail.7d461574.js.gz
  14. 0 0
      dist/js/PaymentResult.670395bb.js
  15. BIN
      dist/js/PaymentResult.670395bb.js.gz
  16. 0 0
      dist/js/SignUp.c4c5ab9e.js
  17. BIN
      dist/js/SignUp.c4c5ab9e.js.gz
  18. 0 0
      dist/js/SignUp.eed67146.js
  19. BIN
      dist/js/SignUp.eed67146.js.gz
  20. 0 0
      dist/js/SignUpAccount.4e05396d.js
  21. BIN
      dist/js/SignUpAccount.4e05396d.js.gz
  22. BIN
      dist/js/SignUpAccount.e0c6e877.js.gz
  23. 0 0
      dist/js/SignUpBaseInfo.775d2d6c.js
  24. BIN
      dist/js/SignUpBaseInfo.775d2d6c.js.gz
  25. 0 0
      dist/js/SignUpBaseInfo.ff148601.js
  26. BIN
      dist/js/SignUpBaseInfo.ff148601.js.gz
  27. 0 0
      dist/js/SignUpLevel.88faaebe.js
  28. BIN
      dist/js/SignUpLevel.88faaebe.js.gz
  29. 0 0
      dist/js/SignUpLevel.da366874.js
  30. BIN
      dist/js/SignUpLevel.da366874.js.gz
  31. BIN
      dist/js/SignUpPayment.2fdc7aa7.js.gz
  32. 0 0
      dist/js/SignUpPayment.5797d033.js
  33. BIN
      dist/js/SignUpPayment.5797d033.js.gz
  34. 17 29
      src/views/app/AppDetail.vue
  35. 4 4
      src/views/signup/SignUp.vue
  36. 2 2
      src/views/signup/SignUpLevel.vue

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


BIN
dist/app.0c13bcec2c56818ff4ee.js.gz


BIN
dist/app.5a1f519c18ac2a6813ed.js.gz


File diff suppressed because it is too large
+ 0 - 0
dist/css/AppDetail.9760102a.css


File diff suppressed because it is too large
+ 0 - 0
dist/css/AppDetail.c819930b.css


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

@@ -0,0 +1 @@
+.SignUp[data-v-4d6b51c8]{max-width:700px;position:relative;overflow-y:auto;overflow-x:hidden;background-color:#fff;margin:0 auto}.container[data-v-4d6b51c8]{min-height:100vh;background:url(../img/signUpBg.8e6b6a64.png) no-repeat top #f3f4f8;background-size:contain;overflow:hidden}.container h2[data-v-4d6b51c8]{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-4d6b51c8]{background:#fff;margin:1.87rem .16rem .15rem;border-radius:.1rem;padding:.22rem}.container .section .title[data-v-4d6b51c8]{margin-top:.28rem;font-size:.18rem;color:#1a1a1a;font-weight:500}.container .section .content[data-v-4d6b51c8]{padding-top:.05rem;color:grey;font-size:.16rem;word-break:break-all}.container .sectionStatus[data-v-4d6b51c8]{text-align:center;padding:1rem 0 .5rem}.container .sectionStatus img[data-v-4d6b51c8]{width:1.2rem}.container .sectionStatus h3[data-v-4d6b51c8]{padding-top:.3rem;font-size:.18rem;color:#1a1a1a}.container .sectionStatus p[data-v-4d6b51c8]{padding-top:.05rem;font-size:.14rem;color:#999}.container .protocol[data-v-4d6b51c8]{font-size:.14rem;margin-bottom:.3rem;text-align:center;display:block;color:#0091ff}.container .van-button--primary[data-v-4d6b51c8]{margin:.36rem 0 .18rem;background-color:#2dc7aa;border:1px solid #2dc7aa;color:#fff;font-size:.18rem;height:.5rem;line-height:.52rem;width:90%;margin-left:5%}

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

@@ -1 +0,0 @@
-.SignUp[data-v-49fecf3a]{max-width:700px;position:relative;overflow-y:auto;overflow-x:hidden;background-color:#fff;margin:0 auto}.container[data-v-49fecf3a]{min-height:100vh;background:url(../img/signUpBg.8e6b6a64.png) no-repeat top #f3f4f8;background-size:contain;overflow:hidden}.container h2[data-v-49fecf3a]{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-49fecf3a]{background:#fff;margin:1.87rem .16rem .15rem;border-radius:.1rem;padding:.22rem}.container .section .title[data-v-49fecf3a]{margin-top:.28rem;font-size:.18rem;color:#1a1a1a;font-weight:500}.container .section .content[data-v-49fecf3a]{padding-top:.05rem;color:grey;font-size:.16rem;word-break:break-all}.container .sectionStatus[data-v-49fecf3a]{text-align:center;padding:1rem 0 .5rem}.container .sectionStatus img[data-v-49fecf3a]{width:1.2rem}.container .sectionStatus h3[data-v-49fecf3a]{padding-top:.3rem;font-size:.18rem;color:#1a1a1a}.container .sectionStatus p[data-v-49fecf3a]{padding-top:.05rem;font-size:.14rem;color:#999}.container .protocol[data-v-49fecf3a]{font-size:.14rem;margin-bottom:.3rem;text-align:center;display:block;color:#0091ff}.container .van-button--primary[data-v-49fecf3a]{margin:.36rem 0 .18rem;background-color:#2dc7aa;border:1px solid #2dc7aa;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/SignUpLevel.c15aafc1.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/AppDetail.13659b5f.js


BIN
dist/js/AppDetail.13659b5f.js.gz


File diff suppressed because it is too large
+ 0 - 0
dist/js/AppDetail.7d461574.js


BIN
dist/js/AppDetail.7d461574.js.gz


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


BIN
dist/js/PaymentResult.243100eb.js.gz → dist/js/PaymentResult.670395bb.js.gz


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


BIN
dist/js/SignUp.c4c5ab9e.js.gz


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


BIN
dist/js/SignUp.eed67146.js.gz


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


BIN
dist/js/SignUpAccount.4e05396d.js.gz


BIN
dist/js/SignUpAccount.e0c6e877.js.gz


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


BIN
dist/js/SignUpBaseInfo.775d2d6c.js.gz


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


BIN
dist/js/SignUpBaseInfo.ff148601.js.gz


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


BIN
dist/js/SignUpLevel.88faaebe.js.gz


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


BIN
dist/js/SignUpLevel.da366874.js.gz


BIN
dist/js/SignUpPayment.2fdc7aa7.js.gz


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


BIN
dist/js/SignUpPayment.5797d033.js.gz


+ 17 - 29
src/views/app/AppDetail.vue

@@ -217,7 +217,7 @@ export default {
                     const songJson = detail.songJson ? JSON.parse(detail.songJson) : []
                     songJson.forEach(item => {
                         // 曲谱
-                        const uploadUrl = item.uploadUrl.split(',')
+                        const uploadUrl = item.uploadUrl ? item.uploadUrl.split(',') : []
                         let tempUrl = []
                         uploadUrl.forEach(url => {
                             tempUrl.push({
@@ -235,9 +235,8 @@ export default {
                         }
                     })
                     this.practiceNum = this.practiceUpload.length
-                    this.performNum = this.performInfo.length
+                    this.performNum = this.performUpload.length
                 }
-                // examRegistrationId
             } catch(err) {
                 //
                 setLoading(false)
@@ -339,14 +338,6 @@ export default {
             if(!this.onCheckFields()) {
                 return
             }
-            console.log(true)
-            console.log({
-                form: this.form,
-                performUpload: this.performUpload, // 演奏曲
-                performInfo: this.performInfo, // 演奏曲基本信息
-                practiceUpload: this.practiceUpload, // 练习曲
-                practiceInfo: this.practiceInfo, // 练习曲基本信息
-            })
 
             let songJson = [] // json 数组
             // 练习课 "PRACTICE"
@@ -379,36 +370,33 @@ export default {
                     uploadUrl: tempUrl.join(',')
                 })
             })
-            console.log(songJson)
-            // lastExamCertificateUrl
-            // lastMusicTheoryCertificateUrl
-            // songJson
-            // status AUDIT_WAIT
             let form = this.form
             let params = {
+                id: form.id,
                 lastExamCertificateUrl: form.lastExamCertificateUrl,
                 lastMusicTheoryCertificateUrl: form.lastMusicTheoryCertificateUrl,
                 songJson: JSON.stringify(songJson),
                 status: "AUDIT_WAIT"
             }
-            console.log(params)
-            // setLoading(true)
-            // try {
-            //     let res = await examRegistrationUpdate()
-            // } catch(err) {
-            //     //
-            // }
+            setLoading(true)
+            try {
+                const res = await examRegistrationUpdate(params)
+                setLoading(false)
+                const result = res.data
+                if(result.code == 200) {
+                    this.__init()
+                } else {
+                    this.$toast(result.msg)
+                }
+            } catch(err) {
+                //
+                setLoading(false)
+            }
         },
         onCheckFields() {
             // 校验数据
             let form = this.form
             // 有值说明是列表
-            console.log({
-                practiceUpload: this.practiceUpload.length,
-                practiceNum: this.practiceNum,
-                performUpload: this.performUpload.length,
-                performNum: this.performNum
-            })
             if(this.practiceUpload.length != this.practiceNum) {
                 this.$toast('请上传练习曲')
                 return false

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

@@ -31,7 +31,7 @@
 				<div class="content" v-else>线上网络教室</div>
 
 				<div class="title">考试简介</div>
-				<div class="content">{{ baseInfo.posterProfile }}</div>
+				<div class="content" v-html="baseInfo.posterProfile"></div>
 
 				<div class="title">报名时间</div>
 				<div class="content">{{ baseInfo.enrollTime }}</div>
@@ -95,13 +95,13 @@ export default {
 					this.baseInfo = {
 						posterTitle: tempData.posterTitle,
 						examMode: tempData.examMode,
-						enrollTime: dayjs(tempData.enrollStartTime).format("YYYY-MM-DD HH:mm") + "~" + dayjs(tempData.enrollEndTime).format("YYYY-MM-DD HH:mm"),
-						enrollTime2: dayjs(tempData.enrollStartTime).format("YYYY-MM-DD HH:mm"),
+						enrollTime: dayjs(tempData.enrollStartTime).format("YYYY-MM-DD") + "~" + dayjs(tempData.enrollEndTime).format("YYYY-MM-DD"),
+						enrollTime2: dayjs(tempData.enrollStartTime).format("YYYY-MM-DD"),
 						examLocationIdList: tempData.examLocationIdList,
 						expectExamTime: dayjs(tempData.expectExamStartTime).format("YYYY-MM-DD") + "~" + dayjs(tempData.expectExamEndTime).format("YYYY-MM-DD"),
 						status: tempStatus,
 						examLocations: tempData.examLocations, // 地址
-						posterProfile: tempData.posterProfile,
+						posterProfile: tempData.posterProfile ? tempData.posterProfile.replace(/\n/ig,'<br/>') : null,
 						transStatus: tempData.status
 					}
 					let poster = tempData.posterBackgroundImg ? JSON.parse(tempData.posterBackgroundImg) : ""

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

@@ -32,7 +32,7 @@
         </div>
         <!-- <div class="title">上传证书</div> -->
         <!-- <van-field readonly clickable name="nation" label="上次考级级别" placeholder="请选择级别" is-link /> -->
-        <van-field readonly clearable name="code" label="上传专业证书" >
+        <van-field readonly clearable name="code" label="已获最高等级专业证书" >
             <template #input>
                 <van-uploader
                     name="certificate"
@@ -49,7 +49,7 @@
         <!-- <van-field readonly clickable name="nation" label="上次考级级别" placeholder="请选择" is-link /> -->
         <!-- 乐理级别为免考 和 专业级别大于2级 -->
         <!-- :required="form.examMusicTheoryId == 999 &&  form.levelId > 2? true : false" -->
-        <van-field readonly clearable name="code" label="上传乐理证书" >
+        <van-field readonly clearable name="code" label="已获最高等级乐理证书" >
             <template #input>
                 <van-uploader
                     name="certificate2"

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