Merge branch 'master' into jenkins

dist/project/schoolRegister.html

@@ -91,21 +91,22 @@
         </van-field>
       </van-cell-group>
 
-      <div class="cell_title">负责人</div>
+      <div class="cell_title">主管领导</div>
       <van-cell-group inset class="cell-group">
-        <van-field required label="负责人姓名" v-model="forms.emergencyContact" maxlength="20"
-          :rules="[{ required: true, message: '请输入负责人姓名' }]" :maxlength="20" name="emergencyContact"
-          placeholder="请输入负责人姓名">
+        <van-field required label="主管领导姓名" v-model="forms.emergencyContact" maxlength="20"
+          :rules="[{ required: true, message: '请输入主管领导姓名' }]" :maxlength="20" name="emergencyContact"
+          placeholder="请输入主管领导姓名">
         </van-field>
 
         <van-field required type="tel" v-model="forms.emergencyContactPhone" maxlength="11" minlength="11"
-          label="负责人手机号" name="emergencyContactPhone"
-          :rules="[{ required: true, message: '请输入负责人手机号' },{ pattern, message: '输入负责人手机号有误' }]"
-          placeholder="请输入负责人手机号码">
+          label="主管领导手机号" name="emergencyContactPhone"
+          :rules="[{ required: true, message: '请输入主管领导手机号' },{ pattern, message: '输入主管领导手机号有误' }]"
+          placeholder="请输入主管领导手机号码">
         </van-field>
 
         <van-field required label="在校职位" v-model="forms.emergencyContactPosition" maxlength="20"
-          :rules="[{ required: true, message: '请输入负责人在校职位' }]" name="emergencyContactPosition" placeholder="请输入负责人在校职位">
+          :rules="[{ required: true, message: '请输入主管领导在校职位' }]" name="emergencyContactPosition"
+          placeholder="请输入主管领导在校职位">
         </van-field>
       </van-cell-group>
 

public/project/preRegister.html

@@ -350,7 +350,7 @@
             registerSubjectId: '',
             registerSubjectNum: null, // 所在声部
             instrumentsPrepareMode: null,
-            learningSystemPrepareMode: null,
+            learningSystemPrepareMode: 'GROUP_PURCHASE',
           },
           btnLoading: false,
           checkPhone: true,

public/project/schoolRegister.html

@@ -93,21 +93,22 @@
         </van-field>
       </van-cell-group>
 
-      <div class="cell_title">负责人</div>
+      <div class="cell_title">主管领导</div>
       <van-cell-group inset class="cell-group">
-        <van-field label="负责人姓名" v-model="forms.emergencyContact" maxlength="5"
-          :rules="[{ required: true, message: '请输入负责人姓名' }]" :maxlength="5" name="emergencyContact"
-          placeholder="请输入负责人姓名">
+        <van-field label="主管领导姓名" v-model="forms.emergencyContact" maxlength="5"
+          :rules="[{ required: true, message: '请输入主管领导姓名' }]" :maxlength="5" name="emergencyContact"
+          placeholder="请输入主管领导姓名">
         </van-field>
 
-        <van-field type="tel" v-model="forms.emergencyContactPhone" maxlength="11" minlength="11" label="负责人手机号"
+        <van-field type="tel" v-model="forms.emergencyContactPhone" maxlength="11" minlength="11" label="主管领导手机号"
           name="emergencyContactPhone"
-          :rules="[{ required: true, message: '请输入负责人手机号' },{ pattern, message: '输入负责人手机号有误' }]"
-          placeholder="请输入负责人手机号码">
+          :rules="[{ required: true, message: '请输入主管领导手机号' },{ pattern, message: '输入主管领导手机号有误' }]"
+          placeholder="请输入主管领导手机号码">
         </van-field>
 
         <van-field label="在校职位" v-model="forms.emergencyContactPosition" maxlength="20"
-          :rules="[{ required: true, message: '请输入负责人在校职位' }]" name="emergencyContactPosition" placeholder="请输入负责人在校职位">
+          :rules="[{ required: true, message: '请输入主管领导在校职位' }]" name="emergencyContactPosition"
+          placeholder="请输入主管领导在校职位">
         </van-field>
       </van-cell-group>
 

src/school/school-detail/eidt-school.tsx

@@ -187,7 +187,7 @@ export default defineComponent({
                 maxlength={50}
                 placeholder="请输入姓名"
               >
-                {{ label: () => <p class={styles.addP}>负责人</p> }}
+                {{ label: () => <p class={styles.addP}>主管领导</p> }}
               </Field>
               <Field
                 label-align="left"

src/school/school-detail/index.tsx

@@ -105,7 +105,7 @@ export default defineComponent({
             </div>
             <div class={styles.detailInfo}>
               <p>
-                <span>负责人</span>
+                <span>主管领导</span>
                 {state.info.emergencyContact}
               </p>
               <p>

src/school/train-planning/component/practice/index.tsx

@@ -124,7 +124,7 @@ export default defineComponent({
       <div class={styles.practice}>
         <div class={styles.tips}>
           <Icon name="warning" class={styles.icon} />
-          乐团加练可对任意班级进行排课，课程类型可多选
+          自定义训练可对任意班级进行排课，课程类型可多选
         </div>
 
         <CellGroup inset class={styles.cellGroup}>

src/school/train-planning/index.tsx

@@ -45,7 +45,7 @@ export default defineComponent({
             }}
           >
             <Tab title="标准训练" name="standard"></Tab>
-            <Tab title="乐团加练" name="practice"></Tab>
+            <Tab title="自定义训练" name="practice"></Tab>
           </Tabs>
         </OSticky>
 

src/views/accompany/index.tsx

@@ -64,7 +64,7 @@ export default defineComponent({
               <div
                 class={styles.container}
                 onClick={() => {
-                  router.replace({
+                  router.push({
                     path: '/musicList',
                     query: {
                       categorieid: item.id

src/views/accompany/music-list.tsx

@@ -36,6 +36,7 @@ export default defineComponent({
     const route = useRoute()
     const router = useRouter()
     const imgDefault = getImage('icon-music.svg')
+    const userInfo = ref<any>({})
     const data = reactive({
       loading: false,
       finished: false,
@@ -75,6 +76,13 @@ export default defineComponent({
         console.log(error)
       }
     }
+    /**获取会员购买记录 */
+    const getUserInfo = async () => {
+      try {
+        const res: any = await request.get(`api-student/student/member`)
+        userInfo.value = res.data || {}
+      } catch (error) {}
+    }
     const option1 = computed(() => {
       const v1: any = data.musicTree.find((n: any) => n.id == route.query.categorieid)
       //   console.log('🚀 ~ v1', v1)
@@ -159,17 +167,32 @@ export default defineComponent({
     }
     //进入云教练
     const openView = (item: any) => {
-      if (!state.user.data.vipMember && state.platformType == 'STUDENT') {
+      // 学生端验证
+      if (state.platformType == 'STUDENT') {
+        //学生有待激活会员
+      if (!userInfo.value.membershipDays && userInfo.value.purchaseMemberRecord) {
         showConfirmDialog({
-          message: '您暂未开通团练宝，请开通后使用'
+          message: '您的团练宝暂未激活，请激活后使用'
+        }).then(() => {
+          router.push({
+            path: '/memberCenter'
+          })
         })
-        .then(() => {
+        return
+      }
+      //学生没有会员
+      if (!userInfo.value.vipMember) {
+        showConfirmDialog({
+          message: '您暂未开通团练宝，请开通后使用'
+        }).then(() => {
           router.push({
             path: '/memberCenter'
           })
         })
         return
       }
+      }
+      
       let src = `${location.origin}/orchestra-music-score/?id=${item.id}`
       console.log('🚀 ~ 去云教练的src', src)
       postMessage({
@@ -184,6 +207,7 @@ export default defineComponent({
       })
     }
     onMounted(() => {
+      getUserInfo()
       getTree()
     })
     return () => (