lex 2 anni fa
parent
commit
19d8664773

+ 34 - 32
src/router/routes-student.ts

@@ -91,10 +91,43 @@ export default [
         meta: {
           title: '申请退团'
         }
+      },
+      {
+        path: '/attendance-rule',
+        name: 'attendance-rule',
+        component: () => import('@/views/attendance-rule/index'),
+        meta: {
+          title: '考勤规则'
+        }
+      },
+      {
+        path: '/ranking-list',
+        name: 'ranking-list',
+        component: () => import('@/student/ranking-list/index'),
+        meta: {
+          title: '排行榜'
+        }
+      },
+      {
+        path: '/exercise-record',
+        name: 'exercise-record',
+        component: () => import('@/views/exercise-record'),
+        meta: {
+          title: '练习记录'
+        }
+      },
+      {
+        path: '/exercis-detail',
+        name: 'exercis-detail',
+        component: () => import('@/views/exercise-record/exercis-detail'),
+        meta: {
+          title: '练习统计'
+        }
       }
     ]
   },
   {
+    // 只针对乐团报名
     path: '/msuicGroup',
     component: MusicAuth,
     children: [
@@ -137,39 +170,8 @@ export default [
         meta: {
           title: '收货地址'
         }
-      },
-      {
-        path: '/attendance-rule',
-        name: 'attendance-rule',
-        component: () => import('@/views/attendance-rule/index'),
-        meta: {
-          title: '考勤规则'
-        }
-      },
-      {
-        path: '/ranking-list',
-        name: 'ranking-list',
-        component: () => import('@/student/ranking-list/index'),
-        meta: {
-          title: '排行榜'
-        }
-      },
-      {
-        path: '/exercise-record',
-        name: 'exercise-record',
-        component: () => import('@/views/exercise-record'),
-        meta: {
-          title: '练习记录'
-        }
-      },
-      {
-        path: '/exercis-detail',
-        name: 'exercis-detail',
-        component: () => import('@/views/exercise-record/exercis-detail'),
-        meta: {
-          title: '练习统计'
-        }
       }
+      // 非乐团报名的路由不要放在这里,放到上面去
     ]
   },
 

+ 17 - 10
src/school/orchestra/compontent/photo-detail.tsx

@@ -258,17 +258,24 @@ export default defineComponent({
 
     return () => (
       <div class={styles.phoneDetail}>
-        <OHeader title={(route.query.name as any) || ''}>
-          {{
-            right: () => (
-              <Icon name={iconDelete} size={22} onClick={() => (state.isEdit = !state.isEdit)} />
-            )
-          }}
-        </OHeader>
+        <OSticky position="top">
+          <OHeader title={(route.query.name as any) || ''}>
+            {{
+              right: () => (
+                <Icon name={iconDelete} size={22} onClick={() => (state.isEdit = !state.isEdit)} />
+              )
+            }}
+          </OHeader>
 
-        <Button icon="plus" block class={styles.addPhone} onClick={() => (state.showPhoto = true)}>
-          上传照片
-        </Button>
+          <Button
+            icon="plus"
+            block
+            class={styles.addPhone}
+            onClick={() => (state.showPhoto = true)}
+          >
+            上传照片
+          </Button>
+        </OSticky>
 
         {state.listState.dataShow ? (
           <List

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

@@ -84,7 +84,7 @@ export default defineComponent({
           return
         }
 
-        if (data.registerOrchestra > 1) {
+        if (data.registerOrchestra >= 1) {
           showDialog({
             title: '提示',
             message: '您已在其它乐团'