Merge branch 'master' into wxl

dist/css/AppDetail~SignUpLevel.d5d75217.css

@@ -1 +0,0 @@
-.mheader[data-v-9865a7b0]{height:.44rem;overflow:hidden}.m-nav-header[data-v-9865a7b0]{position:absolute;left:0;top:0;width:100%;height:.44rem;line-height:.44rem;text-align:center;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;color:#1a1a1a;background:#fff}.m-nav-header.fixed[data-v-9865a7b0]{position:fixed;z-index:99}.m-nav-header.headerColor[data-v-9865a7b0]{background-color:#14928a;color:#fff}.m-nav-header.headerColor .m-nav-bar__title[data-v-9865a7b0]{color:#fff;font-size:.18rem}.m-nav-header .m-nav-bar__title[data-v-9865a7b0]{max-width:60%;margin:0 auto;color:#333;font-weight:500;font-size:.18rem}.m-nav-header .m-nav-bar__left[data-v-9865a7b0],.m-nav-header .m-nav-bar__right[data-v-9865a7b0]{position:absolute;bottom:0}.m-nav-header .m-nav-bar__left[data-v-9865a7b0]{left:.12rem}.m-nav-header .m-nav-bar__left .arrow-left[data-v-9865a7b0]{font-size:.21rem;vertical-align:middle}.m-nav-header .m-nav-bar__right[data-v-9865a7b0]{right:.12rem}

src/views/PaymentResult.vue

@@ -42,12 +42,12 @@
             </p>
             <p>
                 <span>报考专业：</span>
-                {{ examRegistration.subjectName }}({{ examRegistration.level | levelToCN }}/{{ examRegistration.levelFee }}元)
+                {{ examRegistration.subjectName }}({{ examRegistration.level | levelToCN }}/￥{{ examRegistration.levelFee }})
             </p>
             <p>
                 <span>乐理知识：</span>
                 <template v-if="examRegistration.examMusicTheoryLevel">
-                    {{ examRegistration.examMusicTheoryLevel | levelToCN }}/{{ examRegistration.theoryLevelFee }}元
+                    {{ examRegistration.examMusicTheoryLevel | levelToCN }}/￥{{ examRegistration.theoryLevelFee }}
                 </template>
                 <template v-else>
                     免考

src/views/signup/SignUpAccount.vue

@@ -5,19 +5,19 @@
 
 		<div class="title">基本信息</div>
 		<!-- <van-form ref="form" :show-error="false" validate-first @submit="onSubmit" @failed="onFailed"> -->
-		<van-field v-model="form.phone" required name="phone" label="手机号" placeholder="请输入手机号" />
-		<van-field v-model="form.code" required clearable name="code" label="验证码" placeholder="请输入验证码">
+		<van-field v-model="form.phone" type="tel" required name="phone" label="手机号" placeholder="请输入手机号" />
+		<van-field type="number" v-model="form.code" required clearable name="code" label="验证码" placeholder="请输入验证码">
 			<template #button>
 				<span class="codeText" v-show="countDownStatus" @click="onGetCode">获取验证码</span>
 				<span class="code-text" v-show="!countDownStatus">
-					<van-count-down ref="countdown" :auto-start="false" :time="countDownTime" @finish="onCountDownFinished" format="ss秒" />
+					<van-count-down ref="countdown" style="color: #c4c4c4" :auto-start="false" :time="countDownTime" @finish="onCountDownFinished" format="ss秒" />
 				</span>
 			</template>
 		</van-field>
 
 		<div class="agreeProtocol">
 			<van-checkbox v-model="agreeStatus"></van-checkbox>
-			<i style="font-style: normal;" @click="agreeStatus = !agreeStatus">阅读并同意</i> <span @click="onToProtocol">《用户协议》</span>
+			<i style="font-style: normal;" @click="agreeStatus = !agreeStatus">已阅读并同意</i> <span @click="onToProtocol">《酷乐秀用户注册服务协议》</span>
 		</div>
 		<m-button class="stepBtn" text="下一步" @click="onSubmit" native-type="submit" />
 		<!-- </van-form> -->

src/views/signup/SignUpLevel.vue

@@ -47,7 +47,8 @@
         <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="上传乐理证书" >
+        <!-- 乐理级别为免考 和 专业级别大于2级 -->
+        <van-field readonly :required="form.examMusicTheoryId == 999 &&  form.levelId > 2? true : false" clearable name="code" label="上传乐理证书" >
             <template #input>
                 <van-uploader
                     name="certificate2"
@@ -128,7 +129,7 @@ import MStep from '@/components/MStep'
 import setLoading from '@/utils/loading'
 import { patternPhone } from '@/utils/validateRules'
 import { getExamSubjects, getExamSubjectLevel, getExamSubjectSong, uploadFile, getTheoryLevelList, getExamIngOrder, closeOrder } from './SignUpApi'
-import fileUtil from '@/utils/fileUtil'
+// import fileUtil from '@/utils/fileUtil'
 const levelToCN = {
     1: "一级",
     2: "二级",