修改逻辑

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

@@ -40,27 +40,27 @@ export default defineComponent({
     const router = useRouter()
 
     // 查询没有设置指导老师的班级
-    const getClasses = async (show = true) => {
-      try {
-        const { data } = await request.post('/api-school/classGroup/page', {
-          data: {
-            page: 1,
-            rows: 200,
-            schoolId: state.user.data.school.id,
-            hasTeacher: false,
-            orchestraType: 'DELIVERY'
-          }
-        })
-        // 班级数据
-        forms.classList = data.rows || []
-        // 判断没有设置伴学指导的班级
-        if (forms.classList.length > 0 && show) {
-          forms.status = true
-        }
-      } catch {
-        //
-      }
-    }
+    // const getClasses = async (show = true) => {
+    //   try {
+    //     const { data } = await request.post('/api-school/classGroup/page', {
+    //       data: {
+    //         page: 1,
+    //         rows: 200,
+    //         schoolId: state.user.data.school.id,
+    //         hasTeacher: false,
+    //         orchestraType: 'DELIVERY'
+    //       }
+    //     })
+    //     // 班级数据
+    //     forms.classList = data.rows || []
+    //     // 判断没有设置伴学指导的班级
+    //     if (forms.classList.length > 0 && show) {
+    //       forms.status = true
+    //     }
+    //   } catch {
+    //     //
+    //   }
+    // }
 
     const onSubmit = () => {
       // 判断是否有班级没有设置伴学指导
@@ -108,7 +108,7 @@ export default defineComponent({
     }
 
     onMounted(() => {
-      getClasses()
+      // getClasses()
     })
     return () => (
       <div class={styles.practice}>
@@ -255,7 +255,7 @@ export default defineComponent({
           />
         </Popup>
 
-        <Dialog
+        {/* <Dialog
           v-model:show={forms.status}
           message={`您有${forms.classList.length}个班级尚未指定伴学指导，请完成指定后再进行训练规划。`}
           messageAlign="left"
@@ -289,7 +289,7 @@ export default defineComponent({
               getClasses(false)
             }}
           />
-        </OPopup>
+        </OPopup> */}
       </div>
     )
   }

src/school/train-planning/modal/practice-class/index.module.less

@@ -41,9 +41,12 @@
     display: flex;
     align-items: center;
 
+    .maxWidth {
+      max-width: 120px;
+    }
     .name {
       padding-top: 0;
-      max-width: 120px;
+
       font-size: 16px;
       font-weight: 600;
       color: #333333;

src/school/train-planning/modal/practice-class/index.tsx

@@ -182,7 +182,11 @@ export default defineComponent({
               {forms.list.map((item: any) => (
                 <CellGroup
                   class={styles.classCellGroup}
-                  onClick={() => onSelect(item.id)}
+                  onClick={() => {
+                    if (item.teacherId) {
+                      onSelect(item.id)
+                    }
+                  }}
                   border={false}
                 >
                   <Cell center titleStyle={{ flex: '0 auto' }} valueClass={styles.classCheckbox}>
@@ -191,6 +195,15 @@ export default defineComponent({
                       title: () => (
                         <div class={styles.content}>
                           <div class={styles.teacherName}>
+                            {item.teacherName ? (
+                              <div class={[styles.name, styles.maxWidth, 'van-ellipsis']}>
+                                {item.teacherName}
+                              </div>
+                            ) : (
+                              <div class={[styles.name, 'van-ellipsis']} style={{ color: 'red' }}>
+                                暂未设置伴学指导
+                              </div>
+                            )}
                             <div class={[styles.name, 'van-ellipsis']}>{item.teacherName}</div>
                             <Tag type="primary">{item.name}</Tag>
                           </div>
@@ -203,6 +216,7 @@ export default defineComponent({
                         <Checkbox
                           name={item.id}
                           ref={(el: any) => (forms.checkboxRefs[item.id] = el)}
+                          disabled={item.teacherId ? false : true}
                           onClick={(e: any) => {
                             e.stopPropagation()
                           }}

src/student/music-group/layout/index.module.less

@@ -77,6 +77,7 @@
   .wxPopupDialog {
     position: relative;
     overflow: inherit;
+    margin-top: -100px;
     &::before {
       position: absolute;
       content: ' ';

src/student/music-group/pre-apply/index.tsx

@@ -121,18 +121,18 @@ export default defineComponent({
         }
 
         // 判断是否有openId 并且 purchase
-        if (!data.openId && !data.purchase) {
-          if (browser().weixin) {
-            // 微信公众号支付
-            //授权
-            const code = getUrlCode()
-            if (!code) {
-              goAuth(data.wxAppId)
-            } else {
-              state.code = code
-            }
-          }
-        }
+        // if (!data.openId && !data.purchase) {
+        //   if (browser().weixin) {
+        //     // 微信公众号支付
+        //     //授权
+        //     const code = getUrlCode()
+        //     if (!code) {
+        //       goAuth(data.wxAppId)
+        //     } else {
+        //       state.code = code
+        //     }
+        //   }
+        // }
       } catch {
         //
       }
@@ -184,6 +184,16 @@ export default defineComponent({
         state.code = code
         getRegisterStatus()
       }
+    } else {
+      setLogout()
+      const query = {
+        returnUrl: route.path,
+        ...route.query
+      } as any
+      router.replace({
+        path: '/loginMusic',
+        query: query
+      })
     }
 
     // onMounted(() => {

src/views/unit-test/unit-detail/index.module.less

@@ -0,0 +1,38 @@
+.unitDetail {
+}
+
+.unitSection {
+  margin: 12px 13px;
+  padding: 13px 15px;
+  width: auto;
+  overflow: hidden;
+  border-radius: 10px;
+
+  .unitTitle {
+    font-size: 16px;
+    font-weight: 500;
+    color: #333333;
+  }
+
+  .unitCount {
+    padding-top: 10px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+  }
+  .qNums {
+    display: flex;
+    align-items: center;
+    font-size: 14px;
+    color: #333333;
+    line-height: 20px;
+    .num {
+      color: #f67146;
+    }
+  }
+  .icon {
+    width: 14px;
+    height: 14px;
+    margin-right: 4px;
+  }
+}

src/views/unit-test/unit-detail/index.tsx

@@ -1,8 +1,10 @@
-import { Popup } from 'vant'
+import { Cell, Icon, Popup } from 'vant'
 import { defineComponent, reactive } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import NoticeStart from '../model/notice-start'
 import styles from './index.module.less'
+import iconQuestionNums from '../images/icon-question-nums.png'
+import iconCountDown from '../images/icon-count-down.png'
 
 export default defineComponent({
   name: 'unit-detail',
@@ -14,7 +16,24 @@ export default defineComponent({
     })
     return () => (
       <div class={styles.unitDetail}>
-        详情
+        <Cell center class={styles.unitSection}>
+          {{
+            title: () => <div class={styles.unitTitle}>长笛level1上册测验一</div>,
+            label: () => (
+              <div class={styles.unitCount}>
+                <div class={styles.qNums}>
+                  <Icon class={styles.icon} name={iconQuestionNums} />
+                  题目数量 <span class={styles.num}>1</span>/4
+                </div>
+                <div class={styles.qNums}>
+                  <Icon class={styles.icon} name={iconCountDown} />
+                  剩余时长：39:30
+                </div>
+              </div>
+            )
+          }}
+        </Cell>
+
         {/* 测验须知 */}
         <Popup
           v-model:show={state.visiableNotice}