|  | @@ -179,50 +179,28 @@
 | 
	
		
			
				|  |  |      <div class="m-toast__text">加载中...</div>
 | 
	
		
			
				|  |  |    </div>
 | 
	
		
			
				|  |  |    <div id="app">
 | 
	
		
			
				|  |  | -    <!-- <div class="banner">
 | 
	
		
			
				|  |  | -      <img src="./images/initiation/banner.png" alt="">
 | 
	
		
			
				|  |  | -    </div> -->
 | 
	
		
			
				|  |  | -    <div class="title" v-clock v-html="(orchestraName || '') + '首轮报名'"></div>
 | 
	
		
			
				|  |  | +    <div class="title" v-clock v-html="(orchestraName || '') + '管乐团报名申请'"></div>
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      <van-form validate-first scroll-to-error @submit="onSubmit" ref='form' class="form">
 | 
	
		
			
				|  |  | -      <div class="top-tips">科学的教育与关爱,足以改变世界。我们希望,学员的未来会因您和我们的共同努力而更加光辉灿烂!</div>
 | 
	
		
			
				|  |  | +      <div class="top-tips">
 | 
	
		
			
				|  |  | +        1、为了保障乐团顺利组建,避免名额浪费;请家长与孩子以自愿为原则,在确认意向后填写相关信息;专业老师将根据家长的相关填报,确认孩子是否能够加入乐团;<br />
 | 
	
		
			
				|  |  | +        2、自用乐器及课后练习,家长自愿选择准备方式。
 | 
	
		
			
				|  |  | +      </div>
 | 
	
		
			
				|  |  |        <van-cell-group inset class="cell-group">
 | 
	
		
			
				|  |  | -        <van-field type="tel" @blur='checkchangePhone' maxlength="11" minlength="11" label="联系电话(直接监护人)"
 | 
	
		
			
				|  |  | -          v-model="stu.phone" name="phone" :rules="[{ pattern, message: '输入监护人手机号码有误' }]" placeholder="请输入监护人手机号码">
 | 
	
		
			
				|  |  | -        </van-field>
 | 
	
		
			
				|  |  | -        <van-field label="学员姓名" :rules="[{ validator, message }]" name="username" v-model="stu.username"
 | 
	
		
			
				|  |  | -          placeholder="请填写学员真实姓名"></van-field>
 | 
	
		
			
				|  |  |          <van-field label="性别" name="sex" :rules="[{ required: true, message: '请选择性别' }]">
 | 
	
		
			
				|  |  |            <template #input>
 | 
	
		
			
				|  |  | -            <van-radio-group v-model="stu.sex" checked-color="#9A64FF" direction="horizontal">
 | 
	
		
			
				|  |  | -              <van-tag size="large" type="primary" :color="!(stu.sex === 1) ? '#EAEAEA' : '#9A64FF'"
 | 
	
		
			
				|  |  | -                :text-color="!(stu.sex === 1) ? '#AAA' : '#FFF'" class="radioSection" round>
 | 
	
		
			
				|  |  | +            <van-radio-group v-model="stu.sex" checked-color="#57ABF8" direction="horizontal">
 | 
	
		
			
				|  |  | +              <van-tag size="large" type="primary" :color="!(stu.sex === 1) ? '#EAEAEA' : '#57ABF8'"
 | 
	
		
			
				|  |  | +                :text-color="!(stu.sex === 1) ? '#AAA' : '#FFF'" class="radioSection">
 | 
	
		
			
				|  |  |                  <van-radio class="radioItem" :name="1"></van-radio>男生
 | 
	
		
			
				|  |  |                </van-tag>
 | 
	
		
			
				|  |  | -              <van-tag size="large" type="primary" :color="!(stu.sex === 0) ? '#EAEAEA' : '#9A64FF'"
 | 
	
		
			
				|  |  | -                :text-color="!(stu.sex === 0) ? '#AAA' : '#FFF'" class="radioSection" round>
 | 
	
		
			
				|  |  | +              <van-tag size="large" type="primary" :color="!(stu.sex === 0) ? '#EAEAEA' : '#57ABF8'"
 | 
	
		
			
				|  |  | +                :text-color="!(stu.sex === 0) ? '#AAA' : '#FFF'" class="radioSection">
 | 
	
		
			
				|  |  |                  <van-radio class="radioItem" :name="0"></van-radio>女生
 | 
	
		
			
				|  |  |                </van-tag>
 | 
	
		
			
				|  |  |              </van-radio-group>
 | 
	
		
			
				|  |  |            </template>
 | 
	
		
			
				|  |  |          </van-field>
 | 
	
		
			
				|  |  | -        <van-field label="在读年级" v-model="stu.currentGrade" readonly name="currentGrade"
 | 
	
		
			
				|  |  | -          :rules="[{ required: true, message: '请选择在读年级', trigger: 'onChange' }]" @click="pickerChange"
 | 
	
		
			
				|  |  | -          placeholder="请选择在读年级">
 | 
	
		
			
				|  |  | -          <template #right-icon>
 | 
	
		
			
				|  |  | -            <van-icon name="arrow" :color="'#323233'" size="16"></van-icon>
 | 
	
		
			
				|  |  | -          </template>
 | 
	
		
			
				|  |  | -        </van-field>
 | 
	
		
			
				|  |  | -        <van-field label="所在班级" v-model="stu.currentClass" readonly name="currentClass"
 | 
	
		
			
				|  |  | -          :rules="[{ required: true, message: '请选择所在班级', trigger: 'onChange' }]" @click="pickerChange1"
 | 
	
		
			
				|  |  | -          placeholder="请选择所在班级">
 | 
	
		
			
				|  |  | -          <template #right-icon>
 | 
	
		
			
				|  |  | -            <van-icon name="arrow" :color="'#323233'" size="16"></van-icon>
 | 
	
		
			
				|  |  | -          </template>
 | 
	
		
			
				|  |  | -        </van-field>
 | 
	
		
			
				|  |  | -      </van-cell-group>
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | -      <van-cell-group inset class="cell-group">
 | 
	
		
			
				|  |  |          <van-field label="首选声部" v-model="stu.registerSubjectId" readonly name="registerSubjectId"
 | 
	
		
			
				|  |  |            :rules="[{ required: true, message: '请选择首选声部', trigger: 'onChange' }]" @click="pickerChange2"
 | 
	
		
			
				|  |  |            placeholder="请选择首选声部">
 | 
	
	
		
			
				|  | @@ -238,18 +216,47 @@
 | 
	
		
			
				|  |  |            </template>
 | 
	
		
			
				|  |  |          </van-field>
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | +        <van-field label="是否服从调配" name="instrumentsPrepareMode" :rules="[{ required: true, message: '请选择是否服从调配' }]">
 | 
	
		
			
				|  |  | +          <template #input>
 | 
	
		
			
				|  |  | +            <div>
 | 
	
		
			
				|  |  | +              <p class="otherSubject">(如果自选声部名额已满,是否愿意接受安排其他声部?)</p>
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +              <van-radio-group v-model="stu.instrumentsPrepareMode" checked-color="#57ABF8" direction="horizontal">
 | 
	
		
			
				|  |  | +                <van-tag size="large" type="primary"
 | 
	
		
			
				|  |  | +                  :color="!(stu.instrumentsPrepareMode === 'GROUP_PURCHASE')  ? '#EAEAEA' : '#57ABF8'"
 | 
	
		
			
				|  |  | +                  :text-color="!(stu.instrumentsPrepareMode === 'GROUP_PURCHASE') ? '#AAA' : '#FFF'"
 | 
	
		
			
				|  |  | +                  class="radioSection">
 | 
	
		
			
				|  |  | +                  <van-radio class="radioItem" name="GROUP_PURCHASE"></van-radio>愿意
 | 
	
		
			
				|  |  | +                </van-tag>
 | 
	
		
			
				|  |  | +                <van-tag size="large" type="primary"
 | 
	
		
			
				|  |  | +                  :color="!(stu.instrumentsPrepareMode === 'ONESELF') ? '#EAEAEA' : '#57ABF8'"
 | 
	
		
			
				|  |  | +                  :text-color="!(stu.instrumentsPrepareMode === 'ONESELF') ? '#AAA' : '#FFF'" class="radioSection">
 | 
	
		
			
				|  |  | +                  <van-radio class="radioItem" name="ONESELF"></van-radio>不愿意
 | 
	
		
			
				|  |  | +                </van-tag>
 | 
	
		
			
				|  |  | +              </van-radio-group>
 | 
	
		
			
				|  |  | +            </div>
 | 
	
		
			
				|  |  | +          </template>
 | 
	
		
			
				|  |  | +        </van-field>
 | 
	
		
			
				|  |  | +      </van-cell-group>
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +      <van-cell-group inset class="cell-group">
 | 
	
		
			
				|  |  | +        <van-field label="乐器参考表&Ai练习参考表" :border="false" style="padding-bottom: 0;">
 | 
	
		
			
				|  |  | +          <template #input>
 | 
	
		
			
				|  |  | +            <img src="./images/preRegister/banner.png" style="width: 100%" />
 | 
	
		
			
				|  |  | +          </template>
 | 
	
		
			
				|  |  | +        </van-field>
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |          <van-field label="乐器准备方式" name="instrumentsPrepareMode" :rules="[{ required: true, message: '请选择乐器准备方式' }]">
 | 
	
		
			
				|  |  |            <template #input>
 | 
	
		
			
				|  |  | -            <van-radio-group v-model="stu.instrumentsPrepareMode" checked-color="#9A64FF" direction="horizontal">
 | 
	
		
			
				|  |  | +            <van-radio-group v-model="stu.instrumentsPrepareMode" checked-color="#57ABF8" direction="horizontal">
 | 
	
		
			
				|  |  |                <van-tag size="large" type="primary"
 | 
	
		
			
				|  |  | -                :color="!(stu.instrumentsPrepareMode === 'GROUP_PURCHASE')  ? '#EAEAEA' : '#9A64FF'"
 | 
	
		
			
				|  |  | -                :text-color="!(stu.instrumentsPrepareMode === 'GROUP_PURCHASE') ? '#AAA' : '#FFF'" class="radioSection"
 | 
	
		
			
				|  |  | -                round>
 | 
	
		
			
				|  |  | +                :color="!(stu.instrumentsPrepareMode === 'GROUP_PURCHASE')  ? '#EAEAEA' : '#57ABF8'"
 | 
	
		
			
				|  |  | +                :text-color="!(stu.instrumentsPrepareMode === 'GROUP_PURCHASE') ? '#AAA' : '#FFF'" class="radioSection">
 | 
	
		
			
				|  |  |                  <van-radio class="radioItem" name="GROUP_PURCHASE"></van-radio>团购
 | 
	
		
			
				|  |  |                </van-tag>
 | 
	
		
			
				|  |  |                <van-tag size="large" type="primary"
 | 
	
		
			
				|  |  | -                :color="!(stu.instrumentsPrepareMode === 'ONESELF') ? '#EAEAEA' : '#9A64FF'"
 | 
	
		
			
				|  |  | -                :text-color="!(stu.instrumentsPrepareMode === 'ONESELF') ? '#AAA' : '#FFF'" class="radioSection" round>
 | 
	
		
			
				|  |  | +                :color="!(stu.instrumentsPrepareMode === 'ONESELF') ? '#EAEAEA' : '#57ABF8'"
 | 
	
		
			
				|  |  | +                :text-color="!(stu.instrumentsPrepareMode === 'ONESELF') ? '#AAA' : '#FFF'" class="radioSection">
 | 
	
		
			
				|  |  |                  <van-radio class="radioItem" name="ONESELF"></van-radio>自备
 | 
	
		
			
				|  |  |                </van-tag>
 | 
	
		
			
				|  |  |              </van-radio-group>
 | 
	
	
		
			
				|  | @@ -259,26 +266,28 @@
 | 
	
		
			
				|  |  |          <van-field label="乐团学习系统准备方式" name="learningSystemPrepareMode"
 | 
	
		
			
				|  |  |            :rules="[{ required: true, message: '请选择乐团学习系统准备方式' }]">
 | 
	
		
			
				|  |  |            <template #input>
 | 
	
		
			
				|  |  | -            <van-radio-group v-model="stu.learningSystemPrepareMode" checked-color="#9A64FF" direction="horizontal">
 | 
	
		
			
				|  |  | +            <van-radio-group v-model="stu.learningSystemPrepareMode" checked-color="#57ABF8" direction="horizontal">
 | 
	
		
			
				|  |  |                <van-tag size="large" type="primary"
 | 
	
		
			
				|  |  | -                :color="!(stu.learningSystemPrepareMode === 'GROUP_PURCHASE') ? '#EAEAEA' : '#9A64FF'"
 | 
	
		
			
				|  |  | +                :color="!(stu.learningSystemPrepareMode === 'GROUP_PURCHASE') ? '#EAEAEA' : '#57ABF8'"
 | 
	
		
			
				|  |  |                  :text-color="!(stu.learningSystemPrepareMode === 'GROUP_PURCHASE') ? '#AAA' : '#FFF'"
 | 
	
		
			
				|  |  | -                class="radioSection" round>
 | 
	
		
			
				|  |  | +                class="radioSection">
 | 
	
		
			
				|  |  |                  <van-radio class="radioItem" name="GROUP_PURCHASE"></van-radio>团购
 | 
	
		
			
				|  |  |                </van-tag>
 | 
	
		
			
				|  |  |                <van-tag size="large" type="primary"
 | 
	
		
			
				|  |  | -                :color="!(stu.learningSystemPrepareMode === 'ONESELF') ? '#EAEAEA' : '#9A64FF'"
 | 
	
		
			
				|  |  | -                :text-color="!(stu.learningSystemPrepareMode === 'ONESELF') ? '#AAA' : '#FFF'" :color="'#9A64FF'"
 | 
	
		
			
				|  |  | -                class="radioSection" round>
 | 
	
		
			
				|  |  | +                :color="!(stu.learningSystemPrepareMode === 'ONESELF') ? '#EAEAEA' : '#57ABF8'"
 | 
	
		
			
				|  |  | +                :text-color="!(stu.learningSystemPrepareMode === 'ONESELF') ? '#AAA' : '#FFF'" :color="'#57ABF8'"
 | 
	
		
			
				|  |  | +                class="radioSection">
 | 
	
		
			
				|  |  |                  <van-radio class="radioItem" name="ONESELF"></van-radio>自备
 | 
	
		
			
				|  |  |                </van-tag>
 | 
	
		
			
				|  |  |              </van-radio-group>
 | 
	
		
			
				|  |  |            </template>
 | 
	
		
			
				|  |  |          </van-field>
 | 
	
		
			
				|  |  | +        <van-field type="tel" @blur='checkchangePhone' maxlength="11" minlength="11" label="联系电话(直接监护人)"
 | 
	
		
			
				|  |  | +          v-model="stu.phone" name="phone" :rules="[{ pattern, message: '输入监护人手机号码有误' }]" placeholder="请输入监护人手机号码">
 | 
	
		
			
				|  |  | +        </van-field>
 | 
	
		
			
				|  |  |        </van-cell-group>
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -      <van-button size="large" block round class="btn-submit" color="#9A64FF" :loading="btnLoading"
 | 
	
		
			
				|  |  | -        native-type="submit">提交</van-button>
 | 
	
		
			
				|  |  | +      <van-button size="large" block round class="btn-submit" :loading="btnLoading" native-type="submit"></van-button>
 | 
	
		
			
				|  |  |      </van-form>
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      <van-popup v-model:show="showPicker" position="bottom" round>
 | 
	
	
		
			
				|  | @@ -301,7 +310,7 @@
 | 
	
		
			
				|  |  |        style="width: 100%;background-color: transparent;transform: translateY(-60%);" :close-on-click-overlay="false">
 | 
	
		
			
				|  |  |        <div class="submit-container">
 | 
	
		
			
				|  |  |          <p class="submit-title">提交成功</p>
 | 
	
		
			
				|  |  | -        <p class="submit-tips">您已完成乐团预报名</p>
 | 
	
		
			
				|  |  | +        <p class="submit-tips">谢谢您的参与,请留意乐团的<br />后续通知!</p>
 | 
	
		
			
				|  |  |          <div @click="onLinkUrl" class="submit-btn"></div>
 | 
	
		
			
				|  |  |        </div>
 | 
	
		
			
				|  |  |      </van-popup>
 | 
	
	
		
			
				|  | @@ -380,8 +389,8 @@
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |          // 判断是否是微信,只能微信中打开
 | 
	
		
			
				|  |  |          if (!browser().weixin) {
 | 
	
		
			
				|  |  | -          this.showPopup = true
 | 
	
		
			
				|  |  | -          return
 | 
	
		
			
				|  |  | +          // this.showPopup = true
 | 
	
		
			
				|  |  | +          // return
 | 
	
		
			
				|  |  |          } else {
 | 
	
		
			
				|  |  |            //授权
 | 
	
		
			
				|  |  |            const code = getUrlCode()
 | 
	
	
		
			
				|  | @@ -427,8 +436,10 @@
 | 
	
		
			
				|  |  |            }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |            var orchestraDetail = await axios.get('/api-student/open/orchestra/detail/' + this.orchestraId)
 | 
	
		
			
				|  |  | +          // console.log(orchestraDetail.data.code, 'orchestraDetail')
 | 
	
		
			
				|  |  |            if (orchestraDetail.data.code === 200) {
 | 
	
		
			
				|  |  |              this.orchestraName = orchestraDetail.data.data.name || ''
 | 
	
		
			
				|  |  | +            // console.log(this.orchestraName, 'orchestraName')
 | 
	
		
			
				|  |  |              this.canSignUp = orchestraDetail.data.data.status
 | 
	
		
			
				|  |  |              if (orchestraDetail.data.data.status !== 'PRE_REGISTER') {
 | 
	
		
			
				|  |  |                vant.showToast('乐团预报名阶段已结束')
 | 
	
	
		
			
				|  | @@ -439,7 +450,7 @@
 | 
	
		
			
				|  |  |            vant.showDialog({
 | 
	
		
			
				|  |  |              message: '信息获取失败,请联系老师',
 | 
	
		
			
				|  |  |              theme: 'round-button',
 | 
	
		
			
				|  |  | -            confirmButtonColor: '#9A64FF'
 | 
	
		
			
				|  |  | +            confirmButtonColor: '#57ABF8'
 | 
	
		
			
				|  |  |            })
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  |          this.setLoading(false)
 |