Merge branch 'iteration-20240417-subject' into online

src/views/co-ai/index.tsx

@@ -70,8 +70,8 @@ export default defineComponent({
       rows: 20,
       status: 1,
       keyword: '', // 关键词
-      musicSheetCategoriesId: route.query.id as any,
-      musicalInstrumentId: ''
+      musicSheetCategoriesId: route.query.id as any
+      // musicalInstrumentId: ''
     });
     const data = reactive({
       musicSheetCategoriesName: route.query.name as any,
@@ -250,8 +250,8 @@ export default defineComponent({
 
       try {
         const res = await api_musicSheetPage({
-          ...musicForms,
-          musicalInstrumentId: data.subjectItem.value || null
+          ...musicForms
+          // musicalInstrumentId: data.subjectItem.value || null
         });
         if (res.code === 200) {
           if (Array.isArray(res?.data?.rows)) {
@@ -585,7 +585,7 @@ export default defineComponent({
                         handleReset();
                       }
                     }}>
-                    {{
+                    {/* {{
                       left: () =>
                         data.subjectItem.value &&
                         data.subjectList.length > 1 && (
@@ -620,7 +620,7 @@ export default defineComponent({
                             </Popover>
                           </div>
                         )
-                    }}
+                    }} */}
                   </MSearch>
                 </div>
               </div>

src/views/exercise-record/exercis-detail.tsx

@@ -154,10 +154,10 @@ export default defineComponent({
                 <div class={styles.infoMsg}>
                   <p>{infoDetail.value.nickname}</p>
                   <div class={styles.tag}>
-                    {infoDetail.value.subjectNames
-                      ? infoDetail.value.subjectNames
+                    {infoDetail.value.instrumentName
+                      ? infoDetail.value.instrumentName
                       : //  +  infoDetail.value.classGroupName
-                        '暂无声部'}
+                        '暂无乐器'}
                   </div>
                 </div>
               </div>

src/views/hot-music-more/index.tsx

@@ -160,7 +160,7 @@ export default defineComponent({
       //   }
       // });
       state.loading = true;
-      await getSubjecList();
+      // await getSubjecList();
       await getMusicSheetCategories();
       getMusicList();
     });
@@ -294,7 +294,8 @@ export default defineComponent({
             </div>
 
             <div class={styles.changeSubjectContainer}>
-              {state.subjectList.length > 2 && (
+              {/*
+                {state.subjectList.length > 2 && (
                 <>
                   <div class={styles.title}>乐器</div>
                   <div class={styles.subjectContainer}>
@@ -313,6 +314,7 @@ export default defineComponent({
                   </div>
                 </>
               )}
+              */}
 
               {state.types.length > 0 && (
                 <>

src/views/student-register/index.tsx

@@ -1262,13 +1262,14 @@ export default defineComponent({
     onMounted(async () => {
       try {
         // 获取支付类型
+        let expireDay = null;
         const { data } = await request.get(
           '/edu-app/open/paramConfig/queryByParamNameList',
           {
             requestType: 'form',
             params: {
               paramNames:
-                'payment_service_provider,contract_sign,multi_user_limit'
+                'payment_service_provider,contract_sign,multi_user_limit,qr_code_expire_time'
             }
           }
         );
@@ -1282,10 +1283,21 @@ export default defineComponent({
               forms.multi_user_limit = item.paramValue
                 ? Number(item.paramValue)
                 : 1;
+            } else if (item.paramName === 'qr_code_expire_time') {
+              expireDay = item.paramValue ? Number(item.paramValue) : null;
             }
           });
         }
 
+        const createT = route.query.t;
+        if (createT && expireDay !== null) {
+          if (dayjs(Number(createT)).add(expireDay, 'day').isBefore(dayjs())) {
+            forms.showTips = true;
+            forms.showMessage = '二维码已经失效，详情请咨询学校老师';
+            forms.showButton = false;
+          }
+        }
+
         await getRegisterGoods();
       } catch {}
     });

src/views/student-register/register-member/index.tsx

@@ -33,6 +33,7 @@ import { useRoute, useRouter } from 'vue-router';
 import MSticky from '@/components/m-sticky';
 import MMessageTip from '@/components/m-message-tip';
 import SelectStudent from '../modal/select-student';
+import dayjs from 'dayjs';
 const classList: any = [];
 for (let i = 1; i <= 40; i++) {
   classList.push({ text: i + '班', value: i });
@@ -427,12 +428,13 @@ export default defineComponent({
     onMounted(async () => {
       try {
         // 获取支付类型
+        let expireDay = null;
         const { data } = await request.get(
           '/edu-app/open/paramConfig/queryByParamNameList',
           {
             requestType: 'form',
             params: {
-              paramNames: 'multi_user_limit'
+              paramNames: 'multi_user_limit,qr_code_expire_time'
             }
           }
         );
@@ -442,10 +444,21 @@ export default defineComponent({
               forms.multi_user_limit = item.paramValue
                 ? Number(item.paramValue)
                 : 1;
+            } else if (item.paramName === 'qr_code_expire_time') {
+              expireDay = item.paramValue ? Number(item.paramValue) : null;
             }
           });
         }
 
+        const createT = route.query.t;
+        if (createT && expireDay !== null) {
+          if (dayjs(Number(createT)).add(expireDay, 'day').isBefore(dayjs())) {
+            forms.showTips = true;
+            forms.showMessage = '二维码已经失效，详情请咨询学校老师';
+            forms.showButton = false;
+          }
+        }
+
         await getRegisterGoods();
       } catch {}
     });

src/views/student-register/register-new/index.tsx

@@ -37,6 +37,7 @@ import vipGiftIcon from '../images/vip-gift-icon.png';
 import MMessageTip from '@/components/m-message-tip';
 import SelectStudent from '../modal/select-student';
 import { setLoginInit } from '@/state';
+import dayjs from 'dayjs';
 
 const classList: any = [];
 for (let i = 1; i <= 40; i++) {
@@ -81,6 +82,14 @@ export default defineComponent({
       return tempList;
     });
     const forms = reactive({
+      /** 参数数据 */
+      queryParams: {
+        classId: route.query.ci as any,
+        currentGradeNum: route.query.cgn ? Number(route.query.cgn) : null,
+        currentClass: route.query.cc ? Number(route.query.cc) : null,
+        gradeYear: route.query.gy ? Number(route.query.gy) : null
+      },
+
       countDownStatus: true,
       countDownTime: 1000 * 120, // 倒计时时间
       modelValue: false, // 是否选中协议
@@ -124,6 +133,15 @@ export default defineComponent({
       confirmButtonText: '确定',
       messageAlign: 'left' as 'center' | 'left' | 'right'
     });
+
+    // 班级状态
+    const isClassStatus = computed(() => {
+      return {
+        isGrade: forms.queryParams.currentGradeNum ? true : false,
+        isClass: forms.queryParams.currentClass ? true : false
+      };
+    });
+
     const isAgree = ref(false);
     const studentInfo = reactive({
       autoRegister: true,
@@ -132,8 +150,8 @@ export default defineComponent({
       client_secret: 'cooleshow-student',
       extra: {
         nickname: '',
-        currentGradeNum: '',
-        currentClass: '',
+        currentGradeNum: null as any,
+        currentClass: null as any,
         gender: 1,
         registerType: '', // 报名类型
         giftVipDay: 0 // 赠送会员天数
@@ -164,54 +182,6 @@ export default defineComponent({
       }
       forms.imgCodeStatus = true;
     };
-    // const getUserInfos = async () => {
-    //   if (
-    //     studentInfo.password.length !== 6 ||
-    //     !checkPhone(studentInfo.username)
-    //   ) {
-    //     return;
-    //   }
-    //   try {
-    //     const { data } = await request.get(
-    //       `/edu-app/open/student/studentInfo?mobile=${studentInfo.username}&code=${studentInfo.password}&type=REGISTER`
-    //     );
-    //     if (data) {
-    //       if (!studentInfo.extra.nickname) {
-    //         studentInfo.extra.nickname = data.nickname;
-    //       }
-
-    //       if (!studentInfo.extra.currentGradeNum) {
-    //         studentInfo.extra.currentGradeNum = data.currentGradeNum;
-    //       }
-
-    //       if (!studentInfo.extra.currentClass) {
-    //         studentInfo.extra.currentClass = data.currentClass;
-    //       }
-    //       // if (!studentInfo.extra.gender) {
-    //       studentInfo.extra.gender =
-    //         studentInfo.extra.gender !== data.gender
-    //           ? data.gender
-    //           : studentInfo.extra.gender;
-
-    //       // studentInfo.username = data.nickname;
-
-    //       classList.forEach((i: any) => {
-    //         if (i.value === data.currentClass) {
-    //           forms.currentClassText = i.text;
-    //         }
-    //       });
-
-    //       const tempGrade: any = gradeList.value[0] || [];
-    //       tempGrade?.forEach((i: any) => {
-    //         if (i.value === data.currentGradeNum) {
-    //           forms.gradeNumText = i.text;
-    //         }
-    //       });
-    //     }
-    //   } catch {
-    //     //
-    //   }
-    // };
     const getUserInfos = async () => {
       if (
         studentInfo.password.length !== 6 ||
@@ -229,23 +199,26 @@ export default defineComponent({
           const firstStudent: any = forms.studentList[0];
           forms.studentItem = firstStudent;
           studentInfo.extra.nickname = firstStudent.nickname;
-          const tempGrade: any = gradeList.value[0] || [];
-          tempGrade?.forEach((i: any) => {
-            if (i.value === firstStudent.currentGradeNum) {
-              // forms.instrumentCode = i.instrumentCode;
-              forms.gradeNumText = i.text;
-              studentInfo.extra.currentGradeNum = firstStudent.currentGradeNum;
-              // if (forms.schoolInstrumentSetType === 'CLASS') {
-              //   forms.classList = i.classList;
-              // }
-            }
-          });
-          classList.forEach((i: any) => {
-            if (i.value === firstStudent.currentClass) {
-              forms.currentClassText = i.text;
-              studentInfo.extra.currentClass = firstStudent.currentClass;
-            }
-          });
+
+          if (!isClassStatus.value.isGrade) {
+            const tempGrade: any = gradeList.value[0] || [];
+            tempGrade?.forEach((i: any) => {
+              if (i.value === firstStudent.currentGradeNum) {
+                forms.gradeNumText = i.text;
+                studentInfo.extra.currentGradeNum =
+                  firstStudent.currentGradeNum;
+              }
+            });
+          }
+
+          if (!isClassStatus.value.isClass) {
+            classList.forEach((i: any) => {
+              if (i.value === firstStudent.currentClass) {
+                forms.currentClassText = i.text;
+                studentInfo.extra.currentClass = firstStudent.currentClass;
+              }
+            });
+          }
           studentInfo.extra.gender = firstStudent.gender;
 
           forms.isRegister = 'update';
@@ -370,6 +343,8 @@ export default defineComponent({
             ...res,
             extra: JSON.stringify({
               ...extra,
+              gradeYear: forms.queryParams.gradeYear,
+              classId: forms.queryParams.classId,
               schoolId: forms.schoolId
             })
           }
@@ -392,6 +367,8 @@ export default defineComponent({
                 schoolId: forms.schoolId,
                 clientType: 'STUDENT',
                 ...extra,
+                gradeYear: forms.queryParams.gradeYear,
+                classId: forms.queryParams.classId,
                 mobile: username,
                 newRegUser: forms.isRegister === 'create' ? true : false
               }
@@ -473,18 +450,35 @@ export default defineComponent({
         } else {
           forms.showTips = true;
         }
+
+        // 判断是否有传来的年级班级
+        const tempGrade: any = gradeList.value[0] || [];
+        tempGrade?.forEach((i: any) => {
+          if (i.value === forms.queryParams.currentGradeNum) {
+            forms.gradeNumText = i.text;
+            studentInfo.extra.currentGradeNum =
+              forms.queryParams.currentGradeNum;
+          }
+        });
+        classList.forEach((i: any) => {
+          if (i.value === forms.queryParams.currentClass) {
+            forms.currentClassText = i.text;
+            studentInfo.extra.currentClass = forms.queryParams.currentClass;
+          }
+        });
       } catch {}
     };
 
     onMounted(async () => {
       try {
         // 获取支付类型
+        let expireDay = null;
         const { data } = await request.get(
           '/edu-app/open/paramConfig/queryByParamNameList',
           {
             requestType: 'form',
             params: {
-              paramNames: 'multi_user_limit'
+              paramNames: 'multi_user_limit,qr_code_expire_time'
             }
           }
         );
@@ -494,10 +488,21 @@ export default defineComponent({
               forms.multi_user_limit = item.paramValue
                 ? Number(item.paramValue)
                 : 1;
+            } else if (item.paramName === 'qr_code_expire_time') {
+              expireDay = item.paramValue ? Number(item.paramValue) : null;
             }
           });
         }
 
+        const createT = route.query.t;
+        if (createT && expireDay !== null) {
+          if (dayjs(Number(createT)).add(expireDay, 'day').isBefore(dayjs())) {
+            forms.showTips = true;
+            forms.showMessage = '二维码已经失效，详情请咨询学校老师';
+            forms.showButton = false;
+          }
+        }
+
         await getRegisterGoods();
       } catch {}
     });
@@ -506,11 +511,16 @@ export default defineComponent({
     const phoneChangeEmptyInfo = () => {
       studentInfo.password = '';
       studentInfo.extra.nickname = '';
-      studentInfo.extra.currentGradeNum = '';
-      studentInfo.extra.currentClass = '';
+      if (!isClassStatus.value.isGrade) {
+        studentInfo.extra.currentGradeNum = '';
+        forms.gradeNumText = '';
+      }
+
+      if (!isClassStatus.value.isClass) {
+        studentInfo.extra.currentClass = '';
+        forms.currentClassText = '';
+      }
       studentInfo.extra.gender = 1;
-      forms.currentClassText = '';
-      forms.gradeNumText = '';
       forms.studentList = []; // 手机号关联学生列表
       forms.studentItem = {}; // 选择的学生
       forms.isRegister = 'create'; // 是否注册学生
@@ -701,11 +711,13 @@ export default defineComponent({
                 clearable={false}
                 label="所在年级"
                 placeholder="请选择年级"
-                isLink
+                isLink={isClassStatus.value.isGrade ? false : true}
                 readonly
                 clickable={false}
                 modelValue={forms.gradeNumText}
                 onClick={() => {
+                  // 如果传进来则不修改
+                  if (isClassStatus.value.isGrade) return;
                   forms.gradePopupIndex = [studentInfo.extra.currentGradeNum];
                   forms.gradeStatus = true;
                 }}
@@ -715,12 +727,14 @@ export default defineComponent({
               <Field
                 clearable={false}
                 label="所在班级"
+                isLink={isClassStatus.value.isClass ? false : true}
                 placeholder="请选择班级"
-                isLink
                 readonly
                 clickable={false}
                 modelValue={forms.currentClassText}
                 onClick={() => {
+                  // 如果传进来则不修改
+                  if (isClassStatus.value.isClass) return;
                   forms.classPopupIndex = [studentInfo.extra.currentClass];
                   forms.classStatus = true;
                 }}

vite.config.ts

@@ -16,7 +16,7 @@ function resolve(dir: string) {
 // const proxyUrl = 'https://test.lexiaoya.cn/';
 // const proxyUrl = 'https://kt.colexiu.com/';
 // const proxyUrl = 'http://192.168.3.143:7093/';
-const proxyUrl = 'https://dev.kt.colexiu.com/';
+const proxyUrl = 'https://test.kt.colexiu.com/';
 export default defineConfig({
   base: './',
   plugins: [