Merge branch 'master' of http://git.dayaedu.com/lex/orchestra-app

src/router/routes-student.ts

@@ -51,14 +51,16 @@ export default [
         meta: {
           title: '会员中心'
         }
-      }, {
+      },
+      {
         path: '/tradeRecord',
         name: 'tradeRecord',
         component: () => import('@/student/trade-record/index'),
         meta: {
           title: '交易记录'
         }
-      }, {
+      },
+      {
         path: '/my-orchestra',
         name: 'my-orchestra',
         component: () => import('@/student/my-orchestra/index'),
@@ -125,17 +127,26 @@ 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: '/ranking-list',
-    name: 'ranking-list',
-    component: () => import('@/student/ranking-list/index'),
-    meta: {
-      title: '排行榜'
-    }
-  },
+
   ...noLoginRouter,
   ...rootRouter
 ]

src/school/approval-manage/components/approval-item.tsx

@@ -40,7 +40,7 @@ export default defineComponent({
                 <img src={clockIcon} alt="" />
               </div>
               <p class={styles.leftTimer}>
-                {dayjs(props.item.createTime).format('YYYY-MM-DD hh:mm')}
+                {dayjs(props.item.createTime).format('YYYY-MM-DD HH:mm')}
               </p>
             </div>
             {props.type == 'end' && props.item.status == 'PASS' ? (
@@ -75,8 +75,10 @@ export default defineComponent({
                 </div>
               </div>
               <div class={styles.courseInfoRight}>
-                {props.item.leaveCategoryId == 1 ? <p class={styles.approvalType}>请假</p> : null}
-                {props.item.leaveCategoryId == 2 ? <p class={styles.approvalType}>退团</p> : null}
+                {props.item.approveType == 'LEAVE' ? <p class={styles.approvalType}>请假</p> : null}
+                {props.item.approveType == 'ORCHESTRA' ? (
+                  <p class={styles.approvalType}>退团</p>
+                ) : null}
                 {props.type != 'doing' ? <Icon class={styles.icons} name="arrow"></Icon> : null}
               </div>
             </div>

src/school/approval-manage/components/end-approval.tsx

@@ -31,7 +31,7 @@ export default defineComponent({
           refreshing.value = false
         }
 
-        const res = await request.post('/api-school/userLeaveRecord/page', {
+        const res = await request.post('/api-school/userApproveRecord/page', {
           data: { ...forms, hasHandle: true }
         })
 
@@ -69,7 +69,11 @@ export default defineComponent({
       <>
         <div class={styles.approvalWrap}>
           {showContact.value ? (
-            <PullRefresh v-model={refreshing.value} onRefresh={onRefresh}>
+            <PullRefresh
+              v-model={refreshing.value}
+              onRefresh={onRefresh}
+              style="min-height: 100vh;"
+            >
               <List
                 v-model:loading={loading.value}
                 finished={finished.value}

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

@@ -14,7 +14,7 @@ export default defineComponent({
   setup(props) {
     const router = useRouter()
     const onAdjust = () => {
-      router.push({ path: '/course-adjust', query: { id: props.item.id } })
+      router.push({ path: '/course-adjust', query: { id: props.item.id, isBack: 'true' } })
     }
     return () => (
       <>

src/school/approval-manage/components/student-leave.tsx

@@ -27,7 +27,7 @@ export default defineComponent({
     const getLeaveDetail = async () => {
       try {
         const { data } = await request.get(
-          `/api-school/userLeaveRecord/detail/${route.query.id}`,
+          `/api-school/userApproveRecord/detail/${route.query.id}`,
           {}
         )
         item.value = data
@@ -48,9 +48,10 @@ export default defineComponent({
     const approval = async (val: string) => {
       if (!leaveReason.value) {
         showToast('请输入审批原因')
+        return
       }
       try {
-        const { data } = await request.post(`/api-school/userLeaveRecord/approval`, {
+        const { data } = await request.post(`/api-school/userApproveRecord/approval`, {
           data: {
             id: route.query.id,
             approvalComments: leaveReason.value,
@@ -70,7 +71,7 @@ export default defineComponent({
             <OHeader></OHeader>
           </OSticky>
           <ApprovalItem item={item.value} type={route.query.type}></ApprovalItem>
-          {item.value.leaveCategoryId == 1 ? (
+          {item.value.approveType == 'LEAVE' ? (
             <div>
               <div class={styles.leaveInfo}>
                 <p class={styles.subTitle}>
@@ -106,7 +107,7 @@ export default defineComponent({
               </div>
             </div>
           ) : null}
-          {item.value.leaveCategoryId == 2 ? (
+          {item.value.approveType == 'ORCHESTRA' ? (
             <div>
               <div class={styles.leaveInfo}>
                 <p class={styles.subTitle}>

src/school/approval-manage/components/wait-approval.tsx

@@ -31,7 +31,7 @@ export default defineComponent({
           refreshing.value = false
         }
 
-        const res = await request.post('/api-school/userLeaveRecord/page', {
+        const res = await request.post('/api-school/userApproveRecord/page', {
           data: { ...forms, hasHandle: false }
         })
 
@@ -71,7 +71,11 @@ export default defineComponent({
       <>
         <div class={styles.approvalWrap}>
           {showContact.value ? (
-            <PullRefresh v-model={refreshing.value} onRefresh={onRefresh}>
+            <PullRefresh
+              v-model={refreshing.value}
+              onRefresh={onRefresh}
+              style="min-height: 100vh;"
+            >
               <List
                 v-model:loading={loading.value}
                 finished={finished.value}

src/school/approval-manage/course-adjust.tsx

@@ -34,7 +34,8 @@ export default defineComponent({
       timerList: {} as any, // 可选和不可选时间段
       trainTimer: 0,
       selectItem: {} as any,
-      arrangeType: 'STANDARD' // 标准排课还是加课
+      arrangeType: 'STANDARD', // 标准排课还是加课
+      isBack: route.query.isBack
     })
     const forms = reactive({
       classDate: '',
@@ -112,7 +113,7 @@ export default defineComponent({
     const reset = async () => {
       // await getDetail()
       // await getList()
-      if (browser().iPhone && !state.cacheId) {
+      if (browser().iPhone && !state.cacheId && state.isBack != 'true') {
         postMessage({ api: 'back' })
       } else {
         router.back()
@@ -137,11 +138,7 @@ export default defineComponent({
             cacheId: state.cacheId
           }
         })
-        if (browser().iPhone && !state.cacheId) {
-          postMessage({ api: 'back' })
-        } else {
-          router.back()
-        }
+        reset()
         showToast('调整成功')
       } catch (e: any) {
         showToast(e.message)

src/school/approval-manage/index.tsx

@@ -18,14 +18,11 @@ export default defineComponent({
         <OSticky position="top" background="#F8F8F8">
           <OHeader></OHeader>
           <Tabs v-model:active={activeName.value} class={styles.approvalTab}>
-            <Tab name="wait" title="待审批">
-              <WaitApproval></WaitApproval>
-            </Tab>
-            <Tab name="end" title="已完成">
-              <EndApproval></EndApproval>
-            </Tab>
+            <Tab name="wait" title="待审批"></Tab>
+            <Tab name="end" title="已完成"></Tab>
           </Tabs>
         </OSticky>
+        {activeName.value == 'wait' ? <WaitApproval></WaitApproval> : <EndApproval></EndApproval>}
       </>
     )
   }

src/school/attendance/components/attend-student.tsx

@@ -213,7 +213,7 @@ export default defineComponent({
         {/* </OSticky> */}
 
         {showContact.value ? (
-          <PullRefresh v-model={refreshing.value} onRefresh={onRefresh}>
+          <PullRefresh v-model={refreshing.value} onRefresh={onRefresh} style="min-height: 100vh;">
             <List
               v-model:loading={loading.value}
               finished={finished.value}

src/school/attendance/components/attend-teacher.tsx

@@ -210,7 +210,7 @@ export default defineComponent({
         </Sticky>
 
         {showContact.value ? (
-          <PullRefresh v-model={refreshing.value} onRefresh={onRefresh}>
+          <PullRefresh v-model={refreshing.value} onRefresh={onRefresh} style="min-height: 100vh;">
             <List
               v-model:loading={loading.value}
               finished={finished.value}

src/school/attendance/student-att-day.tsx

@@ -128,7 +128,7 @@ export default defineComponent({
           modelValue={forms.nickName}
         ></OSearch>
         {showContact.value ? (
-          <PullRefresh v-model={refreshing.value} onRefresh={onRefresh}>
+          <PullRefresh v-model={refreshing.value} onRefresh={onRefresh} style="min-height: 100vh;">
             <List
               v-model:loading={loading.value}
               finished={finished.value}

src/school/ranking-list/components/day-bang.tsx

@@ -215,7 +215,7 @@ export default defineComponent({
         {/* </OSticky> */}
 
         {showContact.value ? (
-          <PullRefresh v-model={refreshing.value} onRefresh={onRefresh}>
+          <PullRefresh v-model={refreshing.value} onRefresh={onRefresh} style="min-height: 100vh;">
             <List
               v-model:loading={loading.value}
               finished={finished.value}

src/school/ranking-list/components/timer-bang.tsx

@@ -42,7 +42,7 @@ export default defineComponent({
       subjectName: '全部声部',
       page: 1,
       rows: 50,
-      sortType: 'PRACTICE_TIMERS'
+      sortType: 'PRACTICE_TIMES'
     })
     const minDate = ref(new Date(dayjs().subtract(10, 'year').format('YYYY-MM-DD')))
     const maxDate = ref(new Date(dayjs().add(10, 'year').format('YYYY-MM-DD')))
@@ -61,7 +61,6 @@ export default defineComponent({
       }
     )
     const getList = async () => {
-      console.log('getList')
       loading.value = true
       try {
         if (refreshing.value) {

src/school/ranking-list/index.tsx

@@ -26,12 +26,7 @@ export default defineComponent({
       <>
         <OSticky position="top" background="#F8F8F8" onGetHeight={getHeight}>
           <div class={styles.topWrap}>
-            <OHeader
-              isBack={true}
-              color={'#ffffff'}
-              background={'transparent'}
-              border={false}
-            ></OHeader>
+            <OHeader color={'#ffffff'} background={'transparent'} border={false}></OHeader>
             <span class={styles.topTime}>{timers.value}</span>
           </div>
           <Tabs

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

@@ -31,7 +31,7 @@ export default defineComponent({
         <div class={styles.itemWrap} onClick={gotoMsg}>
           <div class={styles.itemLeft}>
             <div class={styles.headerWrap}>
-              <img src={props.item.studentAvatar ? props.item.studentAvatar : defaultIcon} alt="" />
+              <img src={props.item.avatar ? props.item.avatar : defaultIcon} alt="" />
             </div>
           </div>
           <div class={styles.itemRight}>

src/student/ranking-list/components/day-bang.tsx

@@ -113,7 +113,11 @@ export default defineComponent({
       <>
         {showContact.value ? (
           <div>
-            <PullRefresh v-model={refreshing.value} onRefresh={onRefresh}>
+            <PullRefresh
+              v-model={refreshing.value}
+              onRefresh={onRefresh}
+              style="min-height: 100vh;"
+            >
               <List
                 v-model:loading={loading.value}
                 finished={finished.value}

src/student/ranking-list/components/timer-bang.tsx

@@ -112,7 +112,11 @@ export default defineComponent({
 
         {showContact.value ? (
           <div>
-            <PullRefresh v-model={refreshing.value} onRefresh={onRefresh}>
+            <PullRefresh
+              v-model={refreshing.value}
+              onRefresh={onRefresh}
+              style="min-height: 100vh;"
+            >
               <List
                 v-model:loading={loading.value}
                 finished={finished.value}

src/student/ranking-list/index.tsx

@@ -39,12 +39,7 @@ export default defineComponent({
       <>
         <OSticky position="top" background="#F8F8F8" onGetHeight={getHeight}>
           <div class={styles.topWrap}>
-            <OHeader
-              isBack={true}
-              color={'#ffffff'}
-              background={'transparent'}
-              border={false}
-            ></OHeader>
+            <OHeader color={'#ffffff'} background={'transparent'} border={false}></OHeader>
             <span class={styles.topTime} onClick={() => (state.showPopoverTime = true)}>
               {forms.timeName} <Icon name={state.showPopoverTime ? 'arrow-up' : 'arrow-down'} />
             </span>

src/teacher/attendance/index.tsx

@@ -202,7 +202,7 @@ export default defineComponent({
         </Sticky>
 
         {showContact.value ? (
-          <PullRefresh v-model={refreshing.value} onRefresh={onRefresh}>
+          <PullRefresh v-model={refreshing.value} onRefresh={onRefresh} style="min-height: 100vh;">
             <List
               v-model:loading={loading.value}
               finished={finished.value}

src/views/courseList/index.tsx

@@ -56,7 +56,7 @@ export default defineComponent({
                   {/* <img src={item.coverImg} class={styles.cover} /> */}
                   <div class={styles.title}>
                     <div>{item.coursewareDetailName}</div>
-                    <div>已使用 1 次</div>
+                    <div>已使用 {item.useNum} 次</div>
                   </div>
                   <div class={styles.num}>
                     查看

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

@@ -37,7 +37,9 @@ export default defineComponent({
         { text: '交付团' },
         { text: '晋升团' }
       ],
-      id: route.query.id
+      id: route.query.id,
+      heightV: 0 as number,
+      scrollTop: 0 as number
     })
 
     const forms = reactive({
@@ -109,10 +111,16 @@ export default defineComponent({
     onMounted(() => {
       getList()
       getDetail()
+      window.addEventListener('scroll', handleScroll)
     })
-    const onBack = () => {
-      console.log('返回')
-      router.push('/exercise-record')
+    const handleScroll = () => {
+      const scrollTop =
+        window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop || 0
+      state.scrollTop = scrollTop
+    }
+    const getHeight = (dataHeight: number) => {
+      state.heightV = dataHeight
+      console.log(dataHeight, 'dataHeight')
     }
 
     const checkTimer = (val: any) => {
@@ -132,12 +140,11 @@ export default defineComponent({
     }
     return () => (
       <>
-        <OSticky position="top" background="#F8F8F8">
-          <div class={styles.topWrap}>
+        <div class={styles.topWrap}>
+          <OSticky position="top" background="#F8F8F8" onGetHeight={getHeight}>
             <OHeader
-              // onHeaderBack={onBack}
               border={false}
-              background={'transparent'}
+              background={state.heightV > state.scrollTop ? 'transparent' : '#fff'}
             >
               {{
                 right: () => (
@@ -152,50 +159,48 @@ export default defineComponent({
                 )
               }}
             </OHeader>
-            <div class={styles.topInfo}>
-              <div class={styles.topInfoLeft}>
-                <div class={styles.headWrap}>
-                  <img
-                    src={infoDetail.value.avatar ? infoDetail.value.avatar : defaultIcon}
-                    alt=""
-                  />
-                </div>
-                <div class={styles.infoMsg}>
-                  <p>{infoDetail.value.nickname}</p>
-                  <div class={styles.tag}>{infoDetail.value.subjectNames}</div>
-                </div>
+          </OSticky>
+          <div class={styles.topInfo}>
+            <div class={styles.topInfoLeft}>
+              <div class={styles.headWrap}>
+                <img src={infoDetail.value.avatar ? infoDetail.value.avatar : defaultIcon} alt="" />
               </div>
-              <div class={styles.topInfoRight}>
-                <div class={styles.infoDay}>
-                  <p class={styles.infoDayMain}>
-                    {infoDetail.value.practiceDays ? infoDetail.value.practiceDays : 0}{' '}
-                    <span>天</span>
-                  </p>
-                  <p class={styles.infoDaysub}>练习天数</p>
-                </div>
-                <div class={styles.infoTime}>
-                  <p class={styles.infoDayMain}>
-                    {infoDetail.value.practiceTimes ? infoDetail.value.practiceTimes : 0}{' '}
-                    <span>分钟</span>
-                  </p>
-                  <p class={styles.infoDaysub}>练习时长</p>
-                </div>
+              <div class={styles.infoMsg}>
+                <p>{infoDetail.value.nickname}</p>
+                <div class={styles.tag}>{infoDetail.value.subjectNames}</div>
               </div>
             </div>
-            <div class={styles.chioseWrap}>
-              <div style={{ padding: '12px 13px', background: 'transparent' }}>
-                <div
-                  class={styles.searchBand}
-                  onClick={() => {
-                    state.showPopoverTime = true
-                  }}
-                >
-                  {forms.practiceMonthName}
-                  <Icon name={state.showPopoverTime ? 'arrow-up' : 'arrow-down'} />
-                </div>
+            <div class={styles.topInfoRight}>
+              <div class={styles.infoDay}>
+                <p class={styles.infoDayMain}>
+                  {infoDetail.value.practiceDays ? infoDetail.value.practiceDays : 0}{' '}
+                  <span>天</span>
+                </p>
+                <p class={styles.infoDaysub}>练习天数</p>
+              </div>
+              <div class={styles.infoTime}>
+                <p class={styles.infoDayMain}>
+                  {infoDetail.value.practiceTimes ? infoDetail.value.practiceTimes : 0}{' '}
+                  <span>分钟</span>
+                </p>
+                <p class={styles.infoDaysub}>练习时长</p>
+              </div>
+            </div>
+          </div>
+          <div class={styles.chioseWrap}>
+            <div style={{ padding: '12px 13px', background: 'transparent' }}>
+              <div
+                class={styles.searchBand}
+                onClick={() => {
+                  state.showPopoverTime = true
+                }}
+              >
+                {forms.practiceMonthName}
+                <Icon name={state.showPopoverTime ? 'arrow-up' : 'arrow-down'} />
               </div>
+            </div>
 
-              {/* <div style={{ padding: '12px 13px', background: 'transparent' }}>
+            {/* <div style={{ padding: '12px 13px', background: 'transparent' }}>
                 <Popover
                   v-model:show={state.showPopoverOrchestra}
                   actions={state.actions}
@@ -213,9 +218,8 @@ export default defineComponent({
                   }}
                 </Popover>
               </div> */}
-            </div>
           </div>
-        </OSticky>
+        </div>
         {showContact.value ? (
           <PullRefresh v-model={refreshing.value} onRefresh={onRefresh}>
             <List

src/views/exercise-record/index.module.less

@@ -4,4 +4,17 @@
   align-items: center;
   justify-content: space-around;
   background-color: #f8f8f8;
+  .searchBandWrap {
+    max-width: 23%;
+  }
+  .searchBand {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    p {
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+  }
 }

src/views/exercise-record/index.tsx

@@ -208,42 +208,57 @@ export default defineComponent({
               }}
             ></OSearch>
             <div class={styles.chioseWrap}>
-              <div style={{ padding: '12px 13px', background: '#F8F8F8' }}>
+              <div
+                class={styles.searchBandWrap}
+                style={{ padding: '12px 13px', background: '#F8F8F8' }}
+              >
                 <div
                   class={styles.searchBand}
                   onClick={() => {
                     state.showPopoverTime = true
                   }}
                 >
-                  {forms.practiceMonthName}
+                  <p>{forms.practiceMonthName}</p>
+
                   <Icon name={state.showPopoverTime ? 'arrow-up' : 'arrow-down'} />
                 </div>
               </div>
 
-              <div style={{ padding: '12px 13px', background: '#F8F8F8' }}>
+              <div
+                class={styles.searchBandWrap}
+                style={{ padding: '12px 13px', background: '#F8F8F8' }}
+              >
                 <div
                   class={styles.searchBand}
                   onClick={() => {
                     state.showPopoverOrchestra = true
                   }}
                 >
-                  {forms.orchestraName}
+                  <p> {forms.orchestraName}</p>
+
                   <Icon name={state.showPopoverOrchestra ? 'arrow-up' : 'arrow-down'} />
                 </div>
               </div>
-              <div style={{ padding: '12px 13px', background: '#F8F8F8' }}>
+              <div
+                class={styles.searchBandWrap}
+                style={{ padding: '12px 13px', background: '#F8F8F8' }}
+              >
                 <div
                   class={styles.searchBand}
                   onClick={() => {
                     state.showPopoverSubject = true
                   }}
                 >
-                  {forms.subjectName}
+                  <p>{forms.subjectName}</p>
+
                   <Icon name={state.showPopoverSubject ? 'arrow-up' : 'arrow-down'} />
                 </div>
               </div>
 
-              <div style={{ padding: '12px 13px', background: '#F8F8F8' }}>
+              <div
+                class={styles.searchBandWrap}
+                style={{ padding: '12px 13px', background: '#F8F8F8' }}
+              >
                 <Popover
                   v-model:show={state.showPopoverSort}
                   actions={state.actionSorts}
@@ -255,7 +270,7 @@ export default defineComponent({
                   {{
                     reference: () => (
                       <div class={styles.searchBand}>
-                        按天数
+                        <p> {forms.sortTypeName}</p>
                         <Icon name={state.showPopoverSort ? 'arrow-up' : 'arrow-down'} />
                       </div>
                     )
@@ -266,7 +281,7 @@ export default defineComponent({
           </div>
         </OSticky>
         {showContact.value ? (
-          <PullRefresh v-model={refreshing.value} onRefresh={onRefresh}>
+          <PullRefresh v-model={refreshing.value} onRefresh={onRefresh} style="min-height: 100vh;">
             <List
               v-model:loading={loading.value}
               finished={finished.value}