mo 2 år sedan
förälder
incheckning
1c76f27f11

+ 1 - 0
src/router/routes-student.ts

@@ -171,6 +171,7 @@ export default [
           title: '收货地址'
         }
       }
+
       // 非乐团报名的路由不要放在这里,放到上面去
     ]
   },

+ 7 - 2
src/school/approval-manage/components/approval-item.tsx

@@ -3,7 +3,8 @@ import styles from './approval-item.module.less'
 import clockIcon from '@/school/attendance/images/clock-icon.png'
 import passIcon from '../images/pass-icon.png'
 import unpassIcon from '../images/unpass-icon.png'
-import defaultIcon from '@/school/images/default-icon.jpg'
+import defaultIcon from '@/school/images/default-icon.png'
+import studentIcon from '@/school/images/student-icon.png'
 import msgIcon from '@/school/images/msg-icon.png'
 import { Icon, ActionSheet, showToast } from 'vant'
 import dayjs from 'dayjs'
@@ -64,7 +65,11 @@ export default defineComponent({
           <div class={styles.itemWrapBottom}>
             <div class={styles.courseInfo}>
               <div class={styles.courseInfoLeft}>
-                <img class={styles.headImgs} src={defaultIcon} alt="" />
+                {props.item.clientType == 'STUDENT' ? (
+                  <img class={styles.headImgs} src={studentIcon} alt="" />
+                ) : (
+                  <img class={styles.headImgs} src={defaultIcon} alt="" />
+                )}
                 <div class={styles.infoMsg}>
                   <p class={styles.infoMsgMain}>{props.item.nickName}</p>
                   {props.item.clientType == 'STUDENT' ? (

+ 0 - 1
src/school/approval-manage/components/student-course-item.tsx

@@ -3,7 +3,6 @@ import styles from './studnet-course-item.module.less'
 import clockIcon from '@/school/attendance/images/clock-icon.png'
 import passIcon from '../images/pass-icon.png'
 import unpassIcon from '../images/unpass-icon.png'
-import defaultIcon from '@/school/images/default-icon.jpg'
 import msgIcon from '@/school/images/msg-icon.png'
 import { Icon, ActionSheet } from 'vant'
 import dayjs from 'dayjs'

+ 1 - 1
src/school/attendance/modals/student-cell.tsx

@@ -2,7 +2,7 @@ import { defineComponent, reactive, ref } from 'vue'
 import styles from './student-cell.module.less'
 import { Icon, ActionSheet, showToast } from 'vant'
 import { useRouter } from 'vue-router'
-import defaultIcon from '@/school/images/default-icon.jpg'
+import defaultIcon from '@/school/images/student-icon.png'
 import msgIcon from '@/school/images/msg-icon.png'
 import { postMessage } from '@/helpers/native-message'
 import { attType } from '@/constant'

+ 1 - 1
src/school/attendance/modals/teacherAtt-item.tsx

@@ -3,7 +3,7 @@ import styles from './teacherAtt-item.module.less'
 import clockIcon from '../images/clock-icon.png'
 import errorIcon from '../images/error-icon.png'
 import successIcon from '../images/success-icon.png'
-import defaultIcon from '@/school/images/default-icon.jpg'
+import defaultIcon from '@/school/images/default-icon.png'
 import { Icon, ActionSheet } from 'vant'
 import dayjs from 'dayjs'
 import { useRouter } from 'vue-router'

BIN
src/school/images/default-icon.png


BIN
src/school/images/student-icon.png


+ 1 - 1
src/school/ranking-list/modals/rank-item.tsx

@@ -1,6 +1,6 @@
 import { defineComponent, reactive, ref, watch } from 'vue'
 import styles from './rank-item.module.less'
-import defaultIcon from '@/school/images/default-icon.jpg'
+import defaultIcon from '@/school/images/student-icon.png'
 import firstIcon from '../images/first.png'
 import secondIcon from '../images/second.png'
 import thirdIcon from '../images/third.png'

+ 1 - 1
src/school/school-detail/modals/teacher-item.tsx

@@ -2,7 +2,7 @@ import { defineComponent, reactive, ref } from 'vue'
 import styles from './teacher-item.module.less'
 import { Icon, ActionSheet, showToast } from 'vant'
 import { useRouter } from 'vue-router'
-import defaultIcon from '@/school/images/default-icon.jpg'
+import defaultIcon from '@/school/images/default-icon.png'
 import msgIcon from '@/school/images/msg-icon.png'
 import { postMessage } from '@/helpers/native-message'
 import { attType } from '@/constant'

+ 1 - 1
src/student/ranking-list/modals/my-ranking-item.tsx

@@ -1,6 +1,6 @@
 import { defineComponent, reactive, ref, watch } from 'vue'
 import styles from './rank-item.module.less'
-import defaultIcon from '@/school/images/default-icon.jpg'
+import defaultIcon from '@/school/images/student-icon.png'
 export default defineComponent({
   props: ['item', 'type', 'index'],
   name: 'rank-item',

+ 1 - 1
src/student/ranking-list/modals/rank-item.tsx

@@ -1,6 +1,6 @@
 import { defineComponent, reactive, ref, watch } from 'vue'
 import styles from './rank-item.module.less'
-import defaultIcon from '@/school/images/default-icon.jpg'
+import defaultIcon from '@/school/images/student-icon.png'
 import firstIcon from '../images/first.png'
 import secondIcon from '../images/second.png'
 import thirdIcon from '../images/third.png'

+ 0 - 1
src/teacher/attendance/modals/teacherAtt-item.tsx

@@ -3,7 +3,6 @@ import styles from './teacherAtt-item.module.less'
 import clockIcon from '@/school/attendance/images/clock-icon.png'
 import errorIcon from '@/school/attendance/images/error-icon.png'
 import successIcon from '@/school/attendance/images/success-icon.png'
-import defaultIcon from '@/school/images/default-icon.jpg'
 import { Icon, ActionSheet } from 'vant'
 import dayjs from 'dayjs'
 import { useRouter } from 'vue-router'

+ 8 - 0
src/views/exercise-record/exercis-detail.module.less

@@ -10,12 +10,14 @@
     flex-direction: row;
     align-items: center;
     justify-content: space-between;
+    flex-wrap: nowrap;
     .topInfoLeft {
       width: 50%;
       display: flex;
       flex-direction: row;
       align-items: center;
       .headWrap {
+        flex-shrink: 0;
         border-radius: 50%;
         overflow: hidden;
         border: 2px solid #fff;
@@ -29,6 +31,11 @@
       }
       .infoMsg {
         p {
+          display: inline-block;
+          width: 120px;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+          overflow: hidden;
           font-size: 20px;
           font-weight: 600;
           color: #000000;
@@ -36,6 +43,7 @@
           margin-bottom: 6px;
         }
         .tag {
+          display: inline-block;
           padding: 2px 11px;
           // min-width: 50px;
           background: #ff8057;

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

@@ -19,7 +19,7 @@ import { useRoute, useRouter } from 'vue-router'
 import styles from './exercis-detail.module.less'
 import request from '@/helpers/request'
 import questIcon from '@/school/images/quest-icon.png'
-import defaultIcon from '@/school/images/default-icon.jpg'
+import defaultIcon from '@/school/images/default-icon.png'
 import { state as globalState } from '@/state'
 
 export default defineComponent({

+ 7 - 2
src/views/exercise-record/modals/detail-item.tsx

@@ -1,6 +1,5 @@
 import { defineComponent, reactive, ref } from 'vue'
 import styles from './detail-item.module.less'
-import defaultIcon from '@/school/images/default-icon.jpg'
 import msgIcon from '@/school/images/msg-icon.png'
 import sendmsgIcon from '@/school/images/sendmsg-icon.png'
 import phoneIcon from '@/school/images/phone-icon.png'
@@ -59,10 +58,16 @@ export default defineComponent({
       }
       return leve
     }
+    const gotoDetail = () => {
+      window.location.href =
+        window.location.origin + `/orchestra-music-score/colexiu-report.html?id=${props.item.id}`
+
+      // window.open()
+    }
     return () => (
       <>
         <div>
-          <div class={styles.itemWrap}>
+          <div class={styles.itemWrap} onClick={gotoDetail}>
             <div class={styles.itemTop}>
               <div class={styles.itemTopLeft}>
                 <p class={styles.itemTopMain}>{props.item.musicSheetName}</p>

+ 1 - 1
src/views/exercise-record/modals/student-item.tsx

@@ -1,6 +1,6 @@
 import { defineComponent, reactive, ref, watch } from 'vue'
 import styles from './student-item.module.less'
-import defaultIcon from '@/school/images/default-icon.jpg'
+import defaultIcon from '@/school/images/student-icon.png'
 import msgIcon from '@/school/images/msg-icon.png'
 import sendmsgIcon from '@/school/images/sendmsg-icon.png'
 import phoneIcon from '@/school/images/phone-icon.png'