修改字段和逻辑

public/project/initiation.html

@@ -187,12 +187,9 @@
     <van-form validate-first scroll-to-error @submit="onSubmit" ref='form' class="form">
       <div class="top-tips">科学的教育与关爱，足以改变世界。我们希望，学员的未来会因您和我们的共同努力而更加光辉灿烂！</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: '请选择性别' }]">
+        <!-- <van-field label="性别" name="sex" :rules="[{ required: true, message: '请选择性别' }]">
           <template #input>
             <van-radio-group v-model="stu.sex" checked-color="#FF8057" direction="horizontal">
               <van-tag size="large" type="primary" :color="!(stu.sex === 1) ? '#EAEAEA' : '#FF8057'"
@@ -205,7 +202,7 @@
               </van-tag>
             </van-radio-group>
           </template>
-        </van-field>
+        </van-field> -->
         <van-field label="在读年级" v-model="stu.currentGrade" readonly name="currentGrade"
           :rules="[{ required: true, message: '请选择在读年级', trigger: 'onChange' }]" @click="() => showPicker = true"
           placeholder="请选择在读年级">
@@ -222,41 +219,44 @@
           </template>
         </van-field>
 
-        <van-field label="孩子是否有学习过乐器" name="musicalInstrumentsLearning"
-          :rules="[{ required: true, message: '请选择孩子是否有学习过乐器' }]">
+        <van-field label="您是否有意向让孩子加入学校乐团？" name="musicalInstrumentsLearning"
+          :rules="[{ required: true, message: '请选择您的意向' }]">
           <template #input>
-            <van-radio-group v-model="stu.hasLearningExperience" checked-color="#FF8057" direction="horizontal">
-              <van-tag size="large" type="primary" :color="!(stu.hasLearningExperience === 1) ? '#EAEAEA' : '#FF8057'"
-                :text-color="!(stu.hasLearningExperience === 1) ? '#AAA' : '#FFF'" class="radioSection" round>
-                <van-radio class="radioItem" :name="1"></van-radio>是
+            <van-radio-group v-model="stu.joinOrchestra" checked-color="#FF8057" direction="horizontal">
+              <van-tag size="large" type="primary" :color="!(stu.joinOrchestra === 1) ? '#EAEAEA' : '#FF8057'"
+                :text-color="!(stu.joinOrchestra === 1) ? '#AAA' : '#FFF'" class="radioSection" round>
+                <van-radio class="radioItem" :name="1"></van-radio>有意向
               </van-tag>
-              <van-tag size="large" type="primary" :color="!(stu.hasLearningExperience === 0) ? '#EAEAEA' : '#FF8057'"
-                :text-color="!(stu.hasLearningExperience === 0) ? '#AAA' : '#FFF'" class="radioSection"
+              <van-tag size="large" type="primary" :color="!(stu.joinOrchestra === 0) ? '#EAEAEA' : '#FF8057'"
+                :text-color="!(stu.joinOrchestra === 0) ? '#AAA' : '#FFF'" class="radioSection"
                 @click="() => stu.learningSubjectName = ''" round>
-                <van-radio class="radioItem" :name="0"></van-radio>否
+                <van-radio class="radioItem" :name="0"></van-radio>无意向
               </van-tag>
             </van-radio-group>
           </template>
         </van-field>
-        <van-field label="所学乐器" v-if="stu.hasLearningExperience==1" name="learningSubjectName"
+        <van-field label="孩子是否有学习过乐器" v-if="stu.joinOrchestra==1" name="learningSubjectName"
           v-model="stu.learningSubjectName" placeholder="(非必填)请输入所学乐器"></van-field>
-        <van-field label="是否报名参加管乐团家长会了解相关情况" name="joinParentMeeting"
-          :rules="[{ required: true, message: '请选择是否报名参加管乐团家长会了解相关情况' }]">
+        <van-field label="您是否有意向参与线上家长会了解相关情况" name="joinParentMeeting" v-if="stu.joinOrchestra==1"
+          :rules="[{ required: true, message: '请选择您是否有意向参与线上家长会了解相关情况' }]">
           <template #input>
             <van-radio-group v-model="stu.joinParentMeeting" checked-color="#FF8057" direction="horizontal">
               <van-tag size="large" type="primary" :color="!(stu.joinParentMeeting === 1) ? '#EAEAEA' : '#FF8057'"
                 :text-color="!(stu.joinParentMeeting === 1) ? '#AAA' : '#FFF'" class="radioSection" round>
-                <van-radio class="radioItem" :name="1"></van-radio>是
+                <van-radio class="radioItem" :name="1"></van-radio>有意向
               </van-tag>
               <van-tag size="large" type="primary" :color="!(stu.joinParentMeeting === 0) ? '#EAEAEA' : '#FF8057'"
                 :text-color="!(stu.joinParentMeeting === 0) ? '#AAA' : '#FFF'" class="radioSection" round>
-                <van-radio class="radioItem" :name="0"></van-radio>否
+                <van-radio class="radioItem" :name="0"></van-radio>无意向
               </van-tag>
             </van-radio-group>
           </template>
         </van-field>
-        <van-field :border="true" label="您对校管乐团的组建有什么建议" type="textarea" rows="3" name="personalSuggestion"
+        <!-- <van-field :border="true" label="您对校管乐团的组建有什么建议" type="textarea" rows="3" name="personalSuggestion"
           v-model="stu.personalSuggestion" placeholder="(非必填)请填写您的建议内容">
+        </van-field> -->
+        <van-field type="tel" v-if="stu.joinOrchestra==1" maxlength="11" minlength="11" label="联系电话(直接监护人)"
+          v-model="stu.phone" name="phone" :rules="[{ pattern, message: '输入监护人手机号码有误' }]" placeholder="请输入监护人手机号码">
         </van-field>
       </van-cell-group>
 
@@ -323,14 +323,14 @@
           pickerType: null, // 下拉类型
           stu: {
             username: null, // 姓名
-            sex: 1, // 性别
+            // sex: 1, // 性别
             phone: null, // 电话
             currentGrade: '', // 年级
             currentGradeNum: null, // 年级编号
             currentClass: '', // 班级
             currentClassNum: null, // 年级编号
             learningSubjectName: null,
-            hasLearningExperience: null, // 是否有学习经验
+            joinOrchestra: null, //
             personalSuggestion: null, // 个人建议
             joinParentMeeting: null
           },
@@ -434,45 +434,45 @@
           this.submitStatus = false
           window.location.href = window.location.origin + '/orchestra-student/#/download'
         },
-        async checkchangePhone(val) {
-          try {
-            await this.$refs.form.validate('phone')
-            this.checkPhone = false
-            //  查询老数据
-            let tempValues = {}
-            this.setLoading(true)
-            tempValues.orchestraId = this.orchestraId
-            tempValues.phone = this.stu.phone
-
-            var user = await axios.get('/api-student/open/orchestraInitiationSurvey/detailByPhone', {
-              params: {
-                ...tempValues
-              }
-            })
-            console.log(user.data.code)
-            if (user.data.code === 200 && user.data.data) {
-              var detail = user.data.data
-              console.log(detail, 'detail')
-
-              var grade = this.currentGrade.find(item => item.value == detail.currentGrade)
-              var cls = this.classList.find(item => item.value == detail.currentClass)
-              this.stu = {
-                username: detail.username, // 姓名
-                sex: detail.sex ? 1 : 0, // 性别
-                phone: detail.phone, // 电话
-                currentGrade: grade.text, // 年级
-                currentGradeNum: detail.currentGrade, // 年级编号
-                currentClass: cls.text, // 班级
-                currentClassNum: detail.currentClass, // 年级编号
-                learningSubjectName: detail.learningSubjectName,
-                hasLearningExperience: detail.hasLearningExperience ? 1 : 0, // 是否有学习经验
-                personalSuggestion: detail.personalSuggestion, // 个人建议
-                joinParentMeeting: detail.joinParentMeeting ? 1 : 0
-              }
-            }
-          } catch { }
-          this.setLoading(false)
-        },
+        // async checkchangePhone(val) {
+        //   try {
+        //     await this.$refs.form.validate('phone')
+        //     this.checkPhone = false
+        //     //  查询老数据
+        //     let tempValues = {}
+        //     this.setLoading(true)
+        //     tempValues.orchestraId = this.orchestraId
+        //     tempValues.phone = this.stu.phone
+
+        //     var user = await axios.get('/api-student/open/orchestraInitiationSurvey/detailByPhone', {
+        //       params: {
+        //         ...tempValues
+        //       }
+        //     })
+        //     console.log(user.data.code)
+        //     if (user.data.code === 200 && user.data.data) {
+        //       var detail = user.data.data
+        //       console.log(detail, 'detail')
+
+        //       var grade = this.currentGrade.find(item => item.value == detail.currentGrade)
+        //       var cls = this.classList.find(item => item.value == detail.currentClass)
+        //       this.stu = {
+        //         username: detail.username, // 姓名
+        //         sex: detail.sex ? 1 : 0, // 性别
+        //         phone: detail.phone, // 电话
+        //         currentGrade: grade.text, // 年级
+        //         currentGradeNum: detail.currentGrade, // 年级编号
+        //         currentClass: cls.text, // 班级
+        //         currentClassNum: detail.currentClass, // 年级编号
+        //         learningSubjectName: detail.learningSubjectName,
+        //         joinOrchestra: detail.joinOrchestra ? 1 : 0, // 是否有学习经验
+        //         personalSuggestion: detail.personalSuggestion, // 个人建议
+        //         joinParentMeeting: detail.joinParentMeeting ? 1 : 0
+        //       }
+        //     }
+        //   } catch { }
+        //   this.setLoading(false)
+        // },
         validator(val) {
           // 校验函数返回 true 表示校验通过，false 表示不通过
           return this.nameReg.test(val) && (val.length >= 2 && val.length <= 15);