Ver Fonte

修改样式

lex há 2 anos atrás
pai
commit
1693e718cc
74 ficheiros alterados com 164 adições e 83 exclusões
  1. 1 1
      README.md
  2. 0 0
      dist/assets/approval-item-legacy.d86abce9.js
  3. 0 0
      dist/assets/create-message-legacy.b953115a.js
  4. 0 0
      dist/assets/exercis-detail-legacy.bf4998d0.js
  5. 0 0
      dist/assets/grant-detail-legacy.e6036c13.js
  6. 1 1
      dist/assets/icon-touping.11756285.svg
  7. 0 0
      dist/assets/index-legacy.129648fe.js
  8. 0 0
      dist/assets/index-legacy.23fe0267.js
  9. 0 0
      dist/assets/index-legacy.2ab86473.js
  10. 0 0
      dist/assets/index-legacy.37a26c18.js
  11. 0 0
      dist/assets/index-legacy.4c39e3dc.js
  12. 0 0
      dist/assets/index-legacy.7e80b20e.js
  13. 0 0
      dist/assets/index-legacy.8316415f.js
  14. 0 0
      dist/assets/index-legacy.92f7e068.js
  15. 0 0
      dist/assets/index-legacy.cff00380.js
  16. 0 0
      dist/assets/index-legacy.ec3927b3.js
  17. 0 0
      dist/assets/index-legacy.fdc20709.js
  18. 0 0
      dist/assets/login-legacy.96432545.js
  19. 0 0
      dist/assets/login-legacy.d26d3bf4.js
  20. 0 0
      dist/assets/orchestra-detail-legacy.d1e21758.js
  21. 0 0
      dist/assets/orchestra-information-legacy.90f5934b.js
  22. 0 0
      dist/assets/privacy-legacy.40943c97.js
  23. 0 0
      dist/assets/reward-detail-legacy.9e80d8c2.js
  24. 0 0
      dist/assets/student-att-day-legacy.31c4e56b.js
  25. 0 0
      dist/assets/transfer-legacy.861b8461.js
  26. 0 0
      dist/assets/uni-last-legacy.e3d76784.js
  27. 0 0
      dist/assets/unitDetail-legacy.041334ed.js
  28. 1 1
      dist/project/initiation.html
  29. 1 1
      dist/project/preRegister.html
  30. 1 1
      public/project/initiation.html
  31. 1 1
      public/project/preRegister.html
  32. 1 1
      src/helpers/validate.ts
  33. 1 1
      src/router/routes-common.ts
  34. 9 1
      src/router/routes-school.ts
  35. 1 1
      src/router/routes-student.ts
  36. 1 1
      src/school/approval-manage/components/approval-item.tsx
  37. 1 1
      src/school/approval-manage/subsidy/grant-detail.tsx
  38. 1 1
      src/school/approval-manage/subsidy/reward-detail.tsx
  39. 2 2
      src/school/approval-manage/subsidy/subsidyTypes.ts
  40. 17 0
      src/school/attendance-rules/component/range.tsx
  41. 21 0
      src/school/attendance-rules/index.module.less
  42. 35 0
      src/school/attendance-rules/index.tsx
  43. 1 1
      src/school/attendance/index.tsx
  44. 1 1
      src/school/attendance/student-att-day.tsx
  45. 1 1
      src/school/mass-message/component/class-list/index.tsx
  46. 1 1
      src/school/mass-message/component/student-list/index.tsx
  47. 1 1
      src/school/orchestra-story/story-operation/index.tsx
  48. 3 3
      src/school/orchestra/compontent/information.tsx
  49. 5 5
      src/school/orchestra/create-orchestra/index.tsx
  50. 1 1
      src/school/orchestra/index.tsx
  51. 6 6
      src/school/orchestra/modal/student-list.tsx
  52. 1 1
      src/school/orchestra/orchestra-information.tsx
  53. 2 2
      src/school/practice-rewards/index.tsx
  54. 3 3
      src/school/train-planning/component/course-preview/index.tsx
  55. 1 1
      src/school/train-planning/modal/practice-class/index.tsx
  56. 2 2
      src/student/download/index.tsx
  57. 2 2
      src/student/download/transfer.tsx
  58. 1 1
      src/student/music-group/layout/auth.tsx
  59. 1 1
      src/student/music-group/layout/login.tsx
  60. 5 5
      src/student/music-group/pre-apply/component/apply.tsx
  61. 2 2
      src/student/music-group/pre-apply/component/payment.tsx
  62. 1 1
      src/views/coursewarePlay/image/icon-touping.svg
  63. 1 1
      src/views/exercise-record/exercis-detail.tsx
  64. 1 1
      src/views/exercise-record/index.tsx
  65. 3 3
      src/views/hook/useFee.ts
  66. 1 1
      src/views/layout/auth.tsx
  67. 1 1
      src/views/layout/login.tsx
  68. 1 1
      src/views/mine-orchestra/index.tsx
  69. 1 1
      src/views/mine-orchestra/my-class/index.tsx
  70. 1 1
      src/views/preview-protocol/privacy.tsx
  71. 1 1
      src/views/unit-test/model/play-question/index.tsx
  72. 9 9
      src/views/unit-test/unit-create/uni-last.tsx
  73. 1 1
      src/views/unit-test/unit-detail/index.tsx
  74. 6 6
      src/views/unit-test/unit-list/unitDetail.tsx

+ 1 - 1
README.md

@@ -41,7 +41,7 @@ See [Configuration Reference](https://vitejs.dev/config/).
 ### 目录结构
 
 ```
-/src/student -- 学端页面目录
+/src/student -- 学端页面目录
 /src/teacher -- 老师端页面目录
 /src/school  -- 管理端页面目录
 /src/views 三端共用页面,路由最好配置到 routes-common 文件中

Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/assets/approval-item-legacy.d86abce9.js


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/assets/create-message-legacy.b953115a.js


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/assets/exercis-detail-legacy.bf4998d0.js


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/assets/grant-detail-legacy.e6036c13.js


+ 1 - 1
dist/assets/icon-touping.11756285.svg

@@ -10,7 +10,7 @@
         </filter>
     </defs>
     <g id="课件加投屏" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="课件播放(学)" transform="translate(-698.000000, -199.000000)" fill-rule="nonzero">
+        <g id="课件播放(学)" transform="translate(-698.000000, -199.000000)" fill-rule="nonzero">
             <g id="编组-6" transform="translate(690.000000, 119.000000)">
                 <g id="编组-5" transform="translate(0.000000, 70.000000)">
                     <g id="编组-5备份" transform="translate(8.000000, 10.000000)">

Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/assets/index-legacy.129648fe.js


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/assets/index-legacy.23fe0267.js


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/assets/index-legacy.2ab86473.js


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/assets/index-legacy.37a26c18.js


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/assets/index-legacy.4c39e3dc.js


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/assets/index-legacy.7e80b20e.js


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/assets/index-legacy.8316415f.js


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/assets/index-legacy.92f7e068.js


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/assets/index-legacy.cff00380.js


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/assets/index-legacy.ec3927b3.js


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/assets/index-legacy.fdc20709.js


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/assets/login-legacy.96432545.js


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/assets/login-legacy.d26d3bf4.js


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/assets/orchestra-detail-legacy.d1e21758.js


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/assets/orchestra-information-legacy.90f5934b.js


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/assets/privacy-legacy.40943c97.js


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/assets/reward-detail-legacy.9e80d8c2.js


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/assets/student-att-day-legacy.31c4e56b.js


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/assets/transfer-legacy.861b8461.js


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/assets/uni-last-legacy.e3d76784.js


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/assets/unitDetail-legacy.041334ed.js


+ 1 - 1
dist/project/initiation.html

@@ -185,7 +185,7 @@
     <div class="title" v-clock v-html="(orchestraName || '') + '启蒙登记表'">
     </div>
     <van-form validate-first scroll-to-error @submit="onSubmit" ref='form' class="form">
-      <div class="top-tips">科学的教育与关爱,足以改变世界。我们希望,学的未来会因您和我们的共同努力而更加光辉灿烂!</div>
+      <div class="top-tips">科学的教育与关爱,足以改变世界。我们希望,学的未来会因您和我们的共同努力而更加光辉灿烂!</div>
       <van-cell-group inset class="cell-group">
         <van-field type="tel" @blur='checkchangePhone' maxlength="11" minlength="11" label="联系电话(直接监护人)"
           v-model="stu.phone" name="phone" :rules="[{ pattern, message: '输入监护人手机号码有误' }]" placeholder="请输入监护人手机号码">

+ 1 - 1
dist/project/preRegister.html

@@ -185,7 +185,7 @@
     <div class="title" v-clock v-html="(orchestraName || '') + '首轮报名'"></div>
 
     <van-form validate-first scroll-to-error @submit="onSubmit" ref='form' class="form">
-      <div class="top-tips">科学的教育与关爱,足以改变世界。我们希望,学的未来会因您和我们的共同努力而更加光辉灿烂!</div>
+      <div class="top-tips">科学的教育与关爱,足以改变世界。我们希望,学的未来会因您和我们的共同努力而更加光辉灿烂!</div>
       <van-cell-group inset class="cell-group">
         <van-field type="tel" @blur='checkchangePhone' maxlength="11" minlength="11" label="联系电话(直接监护人)"
           v-model="stu.phone" name="phone" :rules="[{ pattern, message: '输入监护人手机号码有误' }]" placeholder="请输入监护人手机号码">

+ 1 - 1
public/project/initiation.html

@@ -185,7 +185,7 @@
     <div class="title" v-clock v-html="(orchestraName || '') + '启蒙登记表'">
     </div>
     <van-form validate-first scroll-to-error @submit="onSubmit" ref='form' class="form">
-      <div class="top-tips">科学的教育与关爱,足以改变世界。我们希望,学的未来会因您和我们的共同努力而更加光辉灿烂!</div>
+      <div class="top-tips">科学的教育与关爱,足以改变世界。我们希望,学的未来会因您和我们的共同努力而更加光辉灿烂!</div>
       <van-cell-group inset class="cell-group">
         <van-field type="tel" @blur='checkchangePhone' maxlength="11" minlength="11" label="联系电话(直接监护人)"
           v-model="stu.phone" name="phone" :rules="[{ pattern, message: '输入监护人手机号码有误' }]" placeholder="请输入监护人手机号码">

+ 1 - 1
public/project/preRegister.html

@@ -185,7 +185,7 @@
     <div class="title" v-clock v-html="(orchestraName || '') + '首轮报名'"></div>
 
     <van-form validate-first scroll-to-error @submit="onSubmit" ref='form' class="form">
-      <div class="top-tips">科学的教育与关爱,足以改变世界。我们希望,学的未来会因您和我们的共同努力而更加光辉灿烂!</div>
+      <div class="top-tips">科学的教育与关爱,足以改变世界。我们希望,学的未来会因您和我们的共同努力而更加光辉灿烂!</div>
       <van-cell-group inset class="cell-group">
         <van-field type="tel" @blur='checkchangePhone' maxlength="11" minlength="11" label="联系电话(直接监护人)"
           v-model="stu.phone" name="phone" :rules="[{ pattern, message: '输入监护人手机号码有误' }]" placeholder="请输入监护人手机号码">

+ 1 - 1
src/helpers/validate.ts

@@ -1,4 +1,4 @@
-// 学地址
+// 学地址
 export function vaildStudentUrl() {
   const url = window.location.href;
   let returnUrl = '';

+ 1 - 1
src/router/routes-common.ts

@@ -152,7 +152,7 @@ export const router: RouteRecordRaw[] = [
     name: 'mine-myphoto',
     component: () => import('@/views/mine-orchestra/my-photo'),
     meta: {
-      title: '乐团剪影'
+      title: '乐团相册'
     }
   },
   {

+ 9 - 1
src/router/routes-school.ts

@@ -82,7 +82,7 @@ export default [
         name: 'school-photo',
         component: () => import('@/school/orchestra/compontent/photo'),
         meta: {
-          title: '乐团剪影'
+          title: '乐团相册'
         }
       },
       {
@@ -398,6 +398,14 @@ export default [
           title: '练习奖励详情'
         }
       },
+      {
+        path: '/attendance-rules',
+        name: 'attendance-rules',
+        component: () => import('@/school/attendance-rules'),
+        meta: {
+          title: '考勤规则设置'
+        }
+      },
 
       //
     ]

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

@@ -20,7 +20,7 @@ const noLoginRouter = [
     name: 'download',
     component: () => import('@/student/download/index'),
     meta: {
-      title: '下载管乐团学端'
+      title: '下载管乐团学端'
     }
   }
 ]

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

@@ -81,7 +81,7 @@ export default defineComponent({
                 <div class={styles.infoMsg}>
                   <p class={styles.infoMsgMain}>{props.item.nickName}</p>
                   {props.item.clientType == 'STUDENT' ? (
-                    <p class={[styles.infoMsgSub, styles.student]}>学</p>
+                    <p class={[styles.infoMsgSub, styles.student]}>学</p>
                   ) : (
                     <p class={[styles.infoMsgSub, styles.teacher]}>老师</p>
                   )}

+ 1 - 1
src/school/approval-manage/subsidy/grant-detail.tsx

@@ -164,7 +164,7 @@ export default defineComponent({
         </OFullRefresh>
         <ODialog
           title="补助标准"
-          message="1、管理补助每个学期最多发放16次,且仅在有配置课件课程的周次发放 \n 2、若本周有配置课件的课程,则需在乐团剪影中上传6张训练照片,若不足6张,则本周次管理补助扣除 \n 3、若未在本学期时间内发布2篇乐团资讯,则下一学期管理补助按标准金额的80%发放 \n 4、若本学期管理补助是按标准金额的80%发放,只要在本学期内发布2篇或以上乐团资讯,则下学期恢复正常管理补助标准"
+          message="1、管理补助每个学期最多发放16次,且仅在有配置课件课程的周次发放 \n 2、若本周有配置课件的课程,则需在乐团相册中上传6张训练照片,若不足6张,则本周次管理补助扣除 \n 3、若未在本学期时间内发布2篇乐团资讯,则下一学期管理补助按标准金额的80%发放 \n 4、若本学期管理补助是按标准金额的80%发放,只要在本学期内发布2篇或以上乐团资讯,则下学期恢复正常管理补助标准"
           v-model:show={dialog.value}
           dialogMarginTop="env(safe-area-inset-top)"
           messageAlign="left"

+ 1 - 1
src/school/approval-manage/subsidy/reward-detail.tsx

@@ -172,7 +172,7 @@ export default defineComponent({
                 })}
               </div>
             ) : (
-              <OEmpty tips="暂无学练习" />
+              <OEmpty tips="暂无学练习" />
             )}
           </div>
         </OFullRefresh>

+ 2 - 2
src/school/approval-manage/subsidy/subsidyTypes.ts

@@ -72,7 +72,7 @@ interface ICourseSchedule {
   classDate: string
   /**伴学指导名 */
   teacherName: string
-  /**学考勤 */
+  /**学考勤 */
   studentAttendance: 'LATE' | 'NORMAL' | 'LEAVE' | 'TRUANCY' | 'UNCALLED'
   /**时间冲突 */
   timeConflict: boolean
@@ -130,7 +130,7 @@ interface ISchoolStaffTrainingSalary {
   status: 'WAIT' | 'SETTLED' | 'PART_SETTLED' | 'SETTLE_FAIL'
 }
 
-/**学列表 */
+/**学列表 */
 interface IStudent {
   /**练习分钟 */
   practiceTimes: number

+ 17 - 0
src/school/attendance-rules/component/range.tsx

@@ -0,0 +1,17 @@
+import { Cell, CellGroup } from 'vant'
+import { defineComponent } from 'vue'
+import styles from '../index.module.less'
+
+export default defineComponent({
+  name: 'range-model',
+  setup() {
+    return () => (
+      <div class={styles.ruleContainer}>
+        <CellGroup inset>
+          <Cell>{{ title: () => <div class={styles.ruleTitle}>签退规则</div> }}</Cell>
+          <Cell>{{ label: () => <div class={styles.ruleContent}></div> }}</Cell>
+        </CellGroup>
+      </div>
+    )
+  }
+})

+ 21 - 0
src/school/attendance-rules/index.module.less

@@ -0,0 +1,21 @@
+.attendanceRules {
+  --van-tab-active-text-color: var(--van-primary-color);
+  --van-tab-text-color: #333;
+  --van-tab-font-size: 16px;
+  :global {
+    .van-tab {
+      // font-weight: 400;
+    }
+    .van-tabs__wrap {
+      // padding-bottom: 3px;
+    }
+  }
+}
+
+.ruleContainer {
+  padding-top: 16px;
+  overflow: hidden;
+
+  .ruleTitle {
+  }
+}

+ 35 - 0
src/school/attendance-rules/index.tsx

@@ -0,0 +1,35 @@
+import { Tab, Tabs } from 'vant'
+import { defineComponent, reactive } from 'vue'
+import Range from './component/range'
+import styles from './index.module.less'
+
+export default defineComponent({
+  name: 'attendance-rules',
+  setup() {
+    const forms = reactive({
+      tabValue: 'range'
+    })
+    return () => (
+      <div class={styles.attendanceRules}>
+        <Tabs
+          sticky
+          lineWidth={20}
+          lineHeight={4}
+          swipeable
+          animated
+          v-model:active={forms.tabValue}
+        >
+          <Tab title="考勤范围" name="range">
+            <Range />
+          </Tab>
+          <Tab title="签到规则" name="signin-rule">
+            1212
+          </Tab>
+          <Tab title="签退规则" name="signout-rule">
+            签退规则
+          </Tab>
+        </Tabs>
+      </div>
+    )
+  }
+})

+ 1 - 1
src/school/attendance/index.tsx

@@ -38,7 +38,7 @@ export default defineComponent({
           lineWidth={16}
           class={styles.stickyAttendance}
         >
-          <Tab name="student" title="学考勤">
+          <Tab name="student" title="学考勤">
             <AttendStudent toHeight={state.heightV} />
           </Tab>
           <Tab name="teacher" title="伴学指导考勤">

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

@@ -119,7 +119,7 @@ export default defineComponent({
             }}
           </OHeader>
           <OSearch
-            placeholder="请输入学姓名"
+            placeholder="请输入学姓名"
             // inputBackground="white"
             // background="#f6f6f6"
             onSearch={(val: any) => {

+ 1 - 1
src/school/mass-message/component/class-list/index.tsx

@@ -243,7 +243,7 @@ export default defineComponent({
                   <Grid border={false} columnNum={3}>
                     <GridItem>
                       <p class={styles.title}>{item.preStudentNum}</p>
-                      <p class={styles.name}>学人数</p>
+                      <p class={styles.name}>学人数</p>
                     </GridItem>
                     <GridItem>
                       <p class={[styles.title]}>

+ 1 - 1
src/school/mass-message/component/student-list/index.tsx

@@ -207,7 +207,7 @@ export default defineComponent({
             </CheckboxGroup>
           </List>
         ) : (
-          <OEmpty btnStatus={false} tips="暂无学" />
+          <OEmpty btnStatus={false} tips="暂无学" />
         )}
       </div>
     )

+ 1 - 1
src/school/orchestra-story/story-operation/index.tsx

@@ -429,7 +429,7 @@ export default defineComponent({
           v-model:show={forms.delStatus}
           title="删除事迹"
           messageAlign="left"
-          message="删除后学将无法再看到本条事迹确认要删除吗?"
+          message="删除后学将无法再看到本条事迹确认要删除吗?"
           showCancelButton
           onConfirm={onConfirm}
         ></ODialog>

+ 3 - 3
src/school/orchestra/compontent/information.tsx

@@ -197,7 +197,7 @@ export default defineComponent({
 
     const initNumCountUp = () => {
       nextTick(() => {
-        // 在读学
+        // 在读学
         const statistics = state.statistics
         new CountUp('currentStudentNum', statistics.currentStudent || 0).start()
         new CountUp('time1', statistics.attendanceRate * 100 || 0).start()
@@ -299,7 +299,7 @@ export default defineComponent({
                 <span id="currentStudentNum">{state.statistics.studentNum || 0}</span>
                 <i> 名</i>
               </p>
-              <p class={styles.name}>在读学</p>
+              <p class={styles.name}>在读学</p>
             </GridItem>
             <GridItem>
               <p class={[styles.title, styles.red]}>
@@ -339,7 +339,7 @@ export default defineComponent({
                   <Grid border={false} columnNum={3}>
                     <GridItem>
                       <p class={styles.title}>{item.preStudentNum || 0}</p>
-                      <p class={styles.name}>在读学</p>
+                      <p class={styles.name}>在读学</p>
                     </GridItem>
                     <GridItem>
                       <p class={[styles.title, styles.teacher, 'van-ellipsis']}>

+ 5 - 5
src/school/orchestra/create-orchestra/index.tsx

@@ -110,13 +110,13 @@ export default defineComponent({
         }
       })
       if (isSelect) {
-        showToast('请选择学')
+        showToast('请选择学')
         return
       }
 
       // 初始化班级
       const tempSelect: any = []
-      // 添加所在学
+      // 添加所在学
       const tempStudents: any = []
       let largeUpSubject: any = {} // 上低音号和大号合集,目前根据编码处理,待定
       state.selectSubjects.forEach((item: any) => {
@@ -125,7 +125,7 @@ export default defineComponent({
         if (item.subjectCode !== 'BARITONE' && item.subjectCode !== 'TUBA') {
           tempSelect.push(item)
         } else {
-          // 获取学
+          // 获取学
           const temps = largeUpSubject.students ? largeUpSubject.students : []
           largeUpSubject = {
             id: largeUpSubject.id ? largeUpSubject.id + ',' + item.id : item.id,
@@ -211,7 +211,7 @@ export default defineComponent({
                     <span style={{ color: 'var(--van-primary-color)' }}>
                       {item.students?.length || 0}
                     </span>{' '}
-                    名学
+                    名学
                   </>
                 )
               }}
@@ -239,7 +239,7 @@ export default defineComponent({
           )}
         </OPopup>
 
-        {/* 选择学 */}
+        {/* 选择学 */}
         <OPopup v-model:modelValue={state.studentStatus} style="background: #f8f8f8;">
           {state.studentStatus && (
             <StudentList

+ 1 - 1
src/school/orchestra/index.tsx

@@ -191,7 +191,7 @@ export default defineComponent({
                         </Tag>
                       </div>
                     ),
-                    label: () => <p>学人数:{item.currentStudentNum || 0}人</p>
+                    label: () => <p>学人数:{item.currentStudentNum || 0}人</p>
                   }}
                 </Cell>
               ))}

+ 6 - 6
src/school/orchestra/modal/student-list.tsx

@@ -45,7 +45,7 @@ export default defineComponent({
       default: ''
     },
     selectStudentIds: {
-      // 选中的学列表
+      // 选中的学列表
       type: Array,
       default: () => []
     }
@@ -150,7 +150,7 @@ export default defineComponent({
       }
     )
 
-    // 监听选择学变化
+    // 监听选择学变化
     watch(
       () => props.selectStudentIds,
       () => {
@@ -172,7 +172,7 @@ export default defineComponent({
         state.orchestra.name = o.text
       }
 
-      // 获取学列表
+      // 获取学列表
       getList()
 
       state.check = [...props.selectStudentIds]
@@ -181,12 +181,12 @@ export default defineComponent({
     return () => (
       <div class={styles.studentList}>
         <OSticky position="top">
-          <OHeader title="选择学" desotry={false} border={false} />
+          <OHeader title="选择学" desotry={false} border={false} />
           <OSearch
             // inputBackground="white"
             // background="#F8F8F8"
             class="searchGroupInput"
-            placeholder="学名称/手机号"
+            placeholder="学名称/手机号"
             onSearch={(val: any) => {
               state.params.keyword = val
               onSearch()
@@ -257,7 +257,7 @@ export default defineComponent({
             </CheckboxGroup>
           </List>
         ) : (
-          <OEmpty btnStatus={false} tips="暂无学" />
+          <OEmpty btnStatus={false} tips="暂无学" />
         )}
 
         <OSticky position="bottom">

+ 1 - 1
src/school/orchestra/orchestra-information.tsx

@@ -261,7 +261,7 @@ export default defineComponent({
         <ODialog
           v-model:show={state.dialogStatus}
           title="删除资讯"
-          message="是否删除该资讯?确认后学端、伴学端将同步删除"
+          message="是否删除该资讯?确认后学端、伴学端将同步删除"
           messageAlign="left"
           dialogMarginTop="env(safe-area-inset-top)"
           showCancelButton

+ 2 - 2
src/school/practice-rewards/index.tsx

@@ -123,14 +123,14 @@ export default defineComponent({
                 percentage={salaryRate.value}
                 strokeWidth={8}
               />
-              <div class={styles.countRewards}>
+              {/* <div class={styles.countRewards}>
                 累计奖励 (元) :
                 <span>
                   {state.seeType === 'see'
                     ? moneyFormat(state.statistics.totalTrainingSalary)
                     : '****'}
                 </span>
-              </div>
+              </div> */}
             </div>
           </div>
         </OSticky>

+ 3 - 3
src/school/train-planning/component/course-preview/index.tsx

@@ -29,7 +29,7 @@ export default defineComponent({
   setup() {
     // SAME_SCHOOL_TEACHER("同学校老师课程冲突"),
     // DIFF_SCHOOL_TEACHER("不同学校老师课程冲突"),
-    // STUDENT("学课程冲突"),
+    // STUDENT("学课程冲突"),
     // LEAVE 请假冲突
     const route = useRoute()
     const router = useRouter()
@@ -337,12 +337,12 @@ export default defineComponent({
                         color="#F44541"
                         size="large"
                         onClick={() => {
-                          state.conflictMessage = '学时间冲突'
+                          state.conflictMessage = '学时间冲突'
                           state.conflictStatus = true
                           state.choiceCourse = item
                         }}
                       >
-                        学冲突
+                        学冲突
                       </Tag>
                     )}
 

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

@@ -239,7 +239,7 @@ export default defineComponent({
                   <Grid border={false} columnNum={3}>
                     <GridItem>
                       <p class={styles.title}>{item.preStudentNum}</p>
-                      <p class={styles.name}>学人数</p>
+                      <p class={styles.name}>学人数</p>
                     </GridItem>
                     <GridItem>
                       <p class={[styles.title]}>

+ 2 - 2
src/student/download/index.tsx

@@ -20,7 +20,7 @@ export default defineComponent({
     const state = reactive({
       wxStatus: false,
       type: 'student',
-      buttonText: '下载管乐团学端'
+      buttonText: '下载管乐团学端'
     })
 
     const onDownload = () => {
@@ -70,7 +70,7 @@ export default defineComponent({
       const type: any = route.query.type
       state.type = type ? type : 'student'
       if (type === 'student') {
-        state.buttonText = '下载管乐团学端'
+        state.buttonText = '下载管乐团学端'
       } else if (type === 'teacher') {
         state.buttonText = '下载管乐团伴学端'
       } else if (type === 'manage') {

+ 2 - 2
src/student/download/transfer.tsx

@@ -15,7 +15,7 @@ export default defineComponent({
     return {
       wxStatus: false,
       type: 'student',
-      buttonText: '下载管乐团学端'
+      buttonText: '下载管乐团学端'
     }
   },
   mounted() {
@@ -27,7 +27,7 @@ export default defineComponent({
 
     if (pn === 's') {
       this.type = 'student'
-      this.buttonText = '下载管乐团学端'
+      this.buttonText = '下载管乐团学端'
       tempPathname = '/orchestra-student/'
       beforeIos = 'BandMusicTeam://linkUrl='
       beforeAndroid = 'orchestrastudent://html:8888/SplashActivity?url='

+ 1 - 1
src/student/music-group/layout/auth.tsx

@@ -19,7 +19,7 @@ export default defineComponent({
   computed: {
     isExternal() {
       // 该路由在外部连接打开是否需要登录
-      // 只判断是否在学端打开
+      // 只判断是否在学端打开
       return (this.$route.meta.isExternal && !browserInfo.isStudent) || false
     },
     isNeedView() {

+ 1 - 1
src/student/music-group/layout/login.tsx

@@ -200,7 +200,7 @@ export default defineComponent({
       <div class={styles.login}>
         <div class={styles.loginTitle}>
           您好,
-          <br /> 欢迎使用管乐团学
+          <br /> 欢迎使用管乐团学
         </div>
         <CellGroup class={styles.margin34} border={false}>
           <Row style={{ marginBottom: '16px' }}>

+ 5 - 5
src/student/music-group/pre-apply/component/apply.tsx

@@ -45,7 +45,7 @@ export default defineComponent({
     const router = useRouter()
     const state = reactive({
       // code: '' as any, // 微信授权code码
-      detail: {} as any, // 学详情
+      detail: {} as any, // 学详情
       currentGrade: [
         { text: '一年级', value: 1 },
         { text: '二年级', value: 2 },
@@ -201,12 +201,12 @@ export default defineComponent({
     return () => (
       <div class={styles.preApplyC}>
         <Form validateFirst scrollToError onSubmit={onSubmit} ref="form" class={styles.form}>
-          <div class={styles.applyTitle}>学信息</div>
+          <div class={styles.applyTitle}>学信息</div>
           <CellGroup inset class={styles.applyCellGroup}>
             <Field
               required
-              label="学信息"
-              placeholder="请填写学真实姓名"
+              label="学信息"
+              placeholder="请填写学真实姓名"
               inputAlign="right"
               v-model={forms.username}
               maxlength={15}
@@ -286,7 +286,7 @@ export default defineComponent({
                 }
 
                 // 切换订单时判断是否有支付中和已支付的订单,并且已注册过
-                // 判断学所在乐团状态,如果在读则不允许更换声部(只能退团重新报名)
+                // 判断学所在乐团状态,如果在读则不允许更换声部(只能退团重新报名)
                 // 退团重新报名也不能更新声部
                 if (
                   props.registerInfo?.registerStatus === 'LEARNING' ||

+ 2 - 2
src/student/music-group/pre-apply/component/payment.tsx

@@ -143,7 +143,7 @@ export default defineComponent({
     })
     const initNumCountUp = () => {
       nextTick(() => {
-        // 在读学
+        // 在读学
         if (countUpRef.needPrice) {
           countUpRef.needPrice.update(state.orderInfo.needPrice)
         } else {
@@ -268,7 +268,7 @@ export default defineComponent({
         <div class={[styles.paymentTips, styles.mlr13]}>
           <p>1、您注册时所选择的乐团声部,即为乐团录取最终确认的声部,请您务必仔细填写;</p>
           <p>
-            2、所有参与乐团的学免费赠送选报声部教材,教材随乐器一同发放,若您自备乐器,则需承担教材运费。
+            2、所有参与乐团的学免费赠送选报声部教材,教材随乐器一同发放,若您自备乐器,则需承担教材运费。
           </p>
         </div>
         <CheckboxGroup

+ 1 - 1
src/views/coursewarePlay/image/icon-touping.svg

@@ -10,7 +10,7 @@
         </filter>
     </defs>
     <g id="课件加投屏" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="课件播放(学)" transform="translate(-698.000000, -199.000000)" fill-rule="nonzero">
+        <g id="课件播放(学)" transform="translate(-698.000000, -199.000000)" fill-rule="nonzero">
             <g id="编组-6" transform="translate(690.000000, 119.000000)">
                 <g id="编组-5" transform="translate(0.000000, 70.000000)">
                     <g id="编组-5备份" transform="translate(8.000000, 10.000000)">

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

@@ -320,7 +320,7 @@ export default defineComponent({
             default: () => (
               <div class={styles.DialogConent}>
                 <p>
-                  练习数据是学生通过云教练自主练习的数据统计,可根据时间段查询学生的练习天数和练习时长{' '}
+                  练习数据是学员通过云教练自主练习的数据统计,可根据时间段查询学员的练习天数和练习时长{' '}
                 </p>
                 <p>练习天数:当天有曲目播放或测评记录即算练习</p>
                 <p>练习时长:曲目播放和曲目测评的时长总和</p>

+ 1 - 1
src/views/exercise-record/index.tsx

@@ -199,7 +199,7 @@ export default defineComponent({
           <div>
             {/* <OHeader onHeaderBack={onBack}></OHeader> */}
             <OSearch
-              placeholder="请输入学姓名"
+              placeholder="请输入学姓名"
               class={styles.recordSearch}
               onSearch={(val: any) => {
                 forms.keyword = val

+ 3 - 3
src/views/hook/useFee.ts

@@ -22,9 +22,9 @@ const gotoMemberCenter = () => {
 
 /**验证是否是会员 */
 export const handleCheckVip = () => {
-  // 学端验证
+  // 学端验证
   if (state.platformType == 'STUDENT') {
-    //学有待激活会员
+    //学有待激活会员
     if (!state.user.data.membershipDays && state.user.data.purchaseMemberRecord) {
       showDialog({
         title: '温馨提示',
@@ -34,7 +34,7 @@ export const handleCheckVip = () => {
       })
       return false
     }
-    //学没有会员
+    //学没有会员
     if (!state.user.data.vipMember) {
       showDialog({
         title: '温馨提示',

+ 1 - 1
src/views/layout/auth.tsx

@@ -19,7 +19,7 @@ export default defineComponent({
   computed: {
     isExternal() {
       // 该路由在外部连接打开是否需要登录
-      // 只判断是否在学端打开
+      // 只判断是否在学端打开
       return (this.$route.meta.isExternal && !browserInfo.isStudent) || false
     },
     isNeedView() {

+ 1 - 1
src/views/layout/login.tsx

@@ -34,7 +34,7 @@ export default defineComponent({
     },
     appName() {
       const template = {
-        STUDENT: '学端',
+        STUDENT: '学端',
         TEACHER: '老师端',
         SCHOOL: '管理端'
       }

+ 1 - 1
src/views/mine-orchestra/index.tsx

@@ -29,7 +29,7 @@ export default defineComponent({
       orchestra: {} as any,
       orchestraStatus: false
     })
-    /** 学获取我的乐团 */
+    /** 学获取我的乐团 */
     const getStudentOrchestras = () => {
       data.loading = true
       request

+ 1 - 1
src/views/mine-orchestra/my-class/index.tsx

@@ -109,7 +109,7 @@ export default defineComponent({
               <Grid border={false} columnNum={3} class={styles.grid}>
                 <GridItem class={'gridBorderRight'}>
                   <p class={styles.title}>{item.studentNum || 0}</p>
-                  <p class={styles.name}>学人数</p>
+                  <p class={styles.name}>学人数</p>
                 </GridItem>
                 <GridItem class={'gridBorderRight'}>
                   <p class={[styles.title]}>{item.notStartCourseNum || 0}</p>

+ 1 - 1
src/views/preview-protocol/privacy.tsx

@@ -87,7 +87,7 @@ export default defineComponent({
           <br />
           (八)消息通知
           <br />
-          我们会通过您的设备的系统通知(PUSH通知),向您推送系统更新、乐团状态、乐团资讯、练习信息、练习功能使用、课程信息及管理老师、乐团学、伴学指导用户动态和您可能感兴趣的资讯等。为了实现上述目的所必需,确保应用处于关闭或后台运行状态下正常接收到系统通知(PUSH通知),我们可能会在合理频率范围内自启动。对于您在使用过程中提供的您的联系方式(包含但不限于联系电话),我们在运营中可能会向其中的一种或多种发送多类通知,用于用户消息告知、身份验证、安全验证、用户使用体验调研等用途。
+          我们会通过您的设备的系统通知(PUSH通知),向您推送系统更新、乐团状态、乐团资讯、练习信息、练习功能使用、课程信息及管理老师、乐团学、伴学指导用户动态和您可能感兴趣的资讯等。为了实现上述目的所必需,确保应用处于关闭或后台运行状态下正常接收到系统通知(PUSH通知),我们可能会在合理频率范围内自启动。对于您在使用过程中提供的您的联系方式(包含但不限于联系电话),我们在运营中可能会向其中的一种或多种发送多类通知,用于用户消息告知、身份验证、安全验证、用户使用体验调研等用途。
           <br />
           (九)除本政策外,在特定场景下,我们将以及时告知的方式(包括但不限于更新本政策、重新签署文件、页面提示、弹窗、系统通知、系统消息、邮件、系统公告或其他便于您获知的方式)另行向您详细说明对应信息的处理目的、方式、范围等规则,并在征得您的授权同意后处理(如适用)。
           <br />

+ 1 - 1
src/views/unit-test/model/play-question/index.tsx

@@ -41,7 +41,7 @@ export default defineComponent({
       type: Boolean,
       default: false
     },
-    // 学详情显示分数
+    // 学详情显示分数
     showScore: {
       type: Boolean,
       default: false

+ 9 - 9
src/views/unit-test/unit-create/uni-last.tsx

@@ -197,7 +197,7 @@ export default defineComponent({
               class={styles.heightValue}
               valueClass={styles.wrapValue}
               value={(forms.value?.preStudentNum || 0) + '人'}
-              title="学人数"
+              title="学人数"
             />
             <Field
               v-model={forms.value.expiryDate}
@@ -234,13 +234,13 @@ export default defineComponent({
               color={'#FF8057'}
               shrink
             >
-              <Tab name="one" title="单团学">
+              <Tab name="one" title="单团学">
                 <NewspaperItem item={datas.uniDetail[1]}></NewspaperItem>
               </Tab>
-              <Tab name="two" title="双团学">
+              <Tab name="two" title="双团学">
                 <NewspaperItem item={datas.uniDetail[2]}></NewspaperItem>
               </Tab>
-              <Tab name="three" title="多团学">
+              <Tab name="three" title="多团学">
                 <NewspaperItem item={datas.uniDetail[3]}></NewspaperItem>
               </Tab>
             </Tabs>
@@ -261,18 +261,18 @@ export default defineComponent({
               title: () => (
                 <div class={styles.DialogTitle}>
                   <span></span>
-                  <p>学分类</p>
+                  <p>学分类</p>
                 </div>
               ),
               default: () => (
                 <div class={styles.DialogConent}>
                   <p>
-                    根据学生入团的批次对不同训练阶段的学生进行分类,不同训练阶段的学生可布置不同标准的课后作业和阶段自测内容。
+                    根据学员入团的批次对不同训练阶段的学员进行分类,不同训练阶段的学员可布置不同标准的课后作业和阶段自测内容。
                   </p>
                   <br />
-                  <p>单团学:最新进入本乐团的学员</p>
-                  <p>双团学:较早进入本乐团的学员</p>
-                  <p>多团学:最早进入本乐团的学员</p>
+                  <p>单团学:最新进入本乐团的学员</p>
+                  <p>双团学:较早进入本乐团的学员</p>
+                  <p>多团学:最早进入本乐团的学员</p>
                 </div>
               )
             }}

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

@@ -34,7 +34,7 @@ export default defineComponent({
       swipeHeight: 'auto' as any
     })
 
-    // 学端查看详情
+    // 学端查看详情
     const getExamDetails = async () => {
       try {
         const { data } = await request.post('/api-student/studentUnitExamination/detail', {

+ 6 - 6
src/views/unit-test/unit-list/unitDetail.tsx

@@ -54,7 +54,7 @@ export default defineComponent({
       }
     }
 
-    // 判断是否可以查看测试报名,如果没有学则不能查看
+    // 判断是否可以查看测试报名,如果没有学则不能查看
     const activeNameStatus = computed(() =>
       form.studentList[activeName.value] && form.studentList[activeName.value].length > 0
         ? false
@@ -91,13 +91,13 @@ export default defineComponent({
             lineHeight={4}
             shrink
           >
-            <Tab name={1} title="单团学">
+            <Tab name={1} title="单团学">
               <UnitStudentList type={1}></UnitStudentList>
             </Tab>
-            <Tab name={2} title="双团学">
+            <Tab name={2} title="双团学">
               <UnitStudentList type={2}></UnitStudentList>
             </Tab>
-            <Tab name={3} title="多团学">
+            <Tab name={3} title="多团学">
               <UnitStudentList type={3}></UnitStudentList>
             </Tab>
           </Tabs>
@@ -127,8 +127,8 @@ export default defineComponent({
 
         <ODialog
           v-model:show={showTip.value}
-          title="学分类"
-          message="根据学生入团的批次对不同训练阶段的学生进行分类,不同训练阶段的学生可布置不同标准的课后作业和阶段自测内容。\n\n单团学生:最新进入本乐团的学员\n双团学生:较早进入本乐团的学员\n多团学生:最早进入本乐团的学员"
+          title="学分类"
+          message="根据学员入团的批次对不同训练阶段的学员进行分类,不同训练阶段的学员可布置不同标准的课后作业和阶段自测内容。\n\n单团学员:最新进入本乐团的学员\n双团学员:较早进入本乐团的学员\n多团学员:最早进入本乐团的学员"
           messageAlign="left"
           confirmButtonText="我知道了"
         />

Alguns ficheiros não foram mostrados porque muitos ficheiros mudaram neste diff