Merge branch 'master' into jenkins

public/project/preRegister.html

@@ -302,7 +302,7 @@
       style="width: 100%;background-color: transparent;transform: translateY(-60%);" :close-on-click-overlay="false">
       <div class="submit-container">
         <p class="submit-title">提交成功</p>
-        <p class="submit-tips">您已完成乐团报名</p>
+        <p class="submit-tips">您已完成乐团预报名</p>
         <div @click="onLinkUrl" class="submit-btn"></div>
       </div>
     </van-popup>

src/router/routes-common.ts

@@ -257,6 +257,13 @@ export const rootRouter = [
     }
   },
   {
+    path: '/transfer',
+    component: () => import('@/student/download/transfer'),
+    meta: {
+      title: '管乐团'
+    }
+  },
+  {
     path: '/:pathMatch(.*)*',
     component: () => import('@/views/404'),
     meta: {

src/router/routes-student.ts

@@ -22,14 +22,7 @@ const noLoginRouter = [
     meta: {
       title: '下载管乐团学生端'
     }
-  },
-  {
-    path: '/transfer',
-    component: () => import('@/student/download/transfer'),
-    meta: {
-      title: '管乐团'
-    }
-  },
+  }
 ]
 
 export default [

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

@@ -232,6 +232,9 @@ export default defineComponent({
                 // v-model:loading={loading.value}
                 finished={finished.value}
                 finished-text=" "
+                style={{
+                  paddingTop: '12px'
+                }}
                 onLoad={getList}
               >
                 {list.value.map((item: any) => (

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

@@ -11,6 +11,7 @@ import styles from './index.module.less'
 import request from '@/helpers/request'
 import { state as globalState } from '@/state'
 import StudentCell from './modals/student-cell'
+import OSticky from '@/components/o-sticky'
 export default defineComponent({
   name: 'student-att-day',
   setup() {
@@ -95,42 +96,52 @@ export default defineComponent({
     return () => (
       <>
         {/* </OSticky> */}
-        <OHeader border={false}>
-          {{
-            title: () => (
-              <div class={styles.NavTitle} onClick={() => (state.showPopoverTime = true)}>
-                {forms.timeName}{' '}
-                <img
-                  class={[styles.sanIcons, state.showPopoverTime ? styles.isReversal : '']}
-                  src={sanIcon}
-                  alt=""
-                />
-              </div>
-            )
+        <OSticky
+          position="top"
+          onGetHeight={(height: any) => {
+            document.documentElement.style.setProperty('--header-height', height + 'px')
           }}
-        </OHeader>
-        <OSearch
-          placeholder="请输入学生姓名"
-          // inputBackground="white"
-          // background="#f6f6f6"
-          onSearch={(val: any) => {
-            forms.nickName = val
-            refreshing.value = true
-            getList()
-          }}
-          modelValue={forms.nickName}
-        ></OSearch>
+        >
+          <OHeader border={false}>
+            {{
+              title: () => (
+                <div class={styles.NavTitle} onClick={() => (state.showPopoverTime = true)}>
+                  {forms.timeName}{' '}
+                  <img
+                    class={[styles.sanIcons, state.showPopoverTime ? styles.isReversal : '']}
+                    src={sanIcon}
+                    alt=""
+                  />
+                </div>
+              )
+            }}
+          </OHeader>
+          <OSearch
+            placeholder="请输入学生姓名"
+            // inputBackground="white"
+            // background="#f6f6f6"
+            onSearch={(val: any) => {
+              forms.nickName = val
+              refreshing.value = true
+              getList()
+            }}
+            modelValue={forms.nickName}
+          ></OSearch>
+        </OSticky>
         {showContact.value ? (
           <OFullRefresh
             v-model:modelValue={refreshing.value}
             onRefresh={onRefresh}
-            style="min-height: 100vh;"
+            style="min-height: calc(100vh - var(--header-height));"
           >
             <List
               loading-text=" "
               // v-model:loading={loading.value}
               finished={finished.value}
               finished-text="没有更多了"
+              style={{
+                paddingTop: '12px'
+              }}
               onLoad={getList}
             >
               {list.value.map((item: any) => (

src/student/download/index.module.less

@@ -4,6 +4,7 @@
   background-size: cover;
   min-height: 100vh;
   padding: 0 42px 0;
+  text-align: center;
   :global {
     .van-image {
       margin-top: 40px;

src/student/download/transfer.tsx

@@ -6,6 +6,8 @@ import wxBg from './images/wx_bg.png'
 import qs from 'query-string'
 import OSticky from '@/components/o-sticky'
 import student from './images/student-center.png'
+import teacher from './images/teacher-center.png'
+import manage from './images/manage-center.png'
 
 export default defineComponent({
   name: 'download-transfer',
@@ -24,14 +26,20 @@ export default defineComponent({
     let beforeAndroid = 'orchestrastudent://html:8888/SplashActivity?url='
 
     if (pn === 's') {
+      this.type = 'student'
+      this.buttonText = '下载管乐团学生端'
       tempPathname = '/orchestra-student/'
       beforeIos = 'BandMusicTeam://linkUrl='
       beforeAndroid = 'orchestrastudent://html:8888/SplashActivity?url='
     } else if (pn === 't') {
+      this.type = 'teacher'
+      this.buttonText = '下载管乐团伴学端'
       tempPathname = '/orchestra-teacher/'
       beforeIos = 'BandMusicTeamTeacher://linkUrl='
       beforeAndroid = 'orchestrateacher://html:8888/SplashActivity?url='
     } else if (pn === 'm') {
+      this.type = 'manage'
+      this.buttonText = '下载管乐团管理端'
       tempPathname = '/orchestra-school/'
       beforeIos = 'BandMusicTeamManager://linkUrl='
       beforeAndroid = 'orchestramanager://html:8888/SplashActivity?url='
@@ -94,7 +102,10 @@ export default defineComponent({
   render() {
     return (
       <div class={[styles.downloadContainer]}>
-        <Image src={student} />
+        {/* <Image src={student} /> */}
+        {this.type !== 'teacher' && this.type !== 'manage' && <Image src={student} />}
+        {this.type === 'teacher' && <Image src={teacher} />}
+        {this.type === 'manage' && <Image src={manage} />}
 
         <div class={styles.buttonGroup}>
           <Button round size="large" color="#FF8057" class={styles.btn} onClick={this.onDownload}>

src/student/music-group/pre-apply/component/user-auth.tsx

@@ -45,12 +45,12 @@ export default defineComponent({
             save: true
           }
         })
-        showToast('实名成功')
+        // showToast('实名成功')
         state.user.data.account.realName = this.form.realName
         state.user.data.account.idCardNo = this.form.idCardNo
-        setTimeout(() => {
-          this.onSuccess()
-        }, 500)
+        // setTimeout(() => {
+        // }, 500)
+        this.onSuccess()
       } catch {
         //
       }

src/student/music-group/shop-address/address-operation.tsx

@@ -130,7 +130,7 @@ export default defineComponent({
           />
           <Field
             label="所在地区"
-            placeholder="省/市/区/街道"
+            placeholder="省/市/区"
             readonly
             isLink
             modelValue={state.pcrStr}
@@ -140,7 +140,7 @@ export default defineComponent({
           />
           <Field
             label="详细地址"
-            placeholder="小区楼栋/乡村名称"
+            placeholder="街道/小区楼栋/乡村名称"
             type="textarea"
             rows={3}
             v-model={state.detailAddress}

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

@@ -45,6 +45,10 @@ export default defineComponent({
     const refreshing = ref(false)
     const loading = ref(false)
     const getList = async () => {
+      if (form.isClick) {
+        return
+      }
+      form.isClick = true
       loading.value = true
       try {
         if (refreshing.value) {
@@ -80,6 +84,7 @@ export default defineComponent({
         form.listState.dataShow = false
         form.listState.finished = true
       }
+      form.isClick = false
     }
     const onRefresh = () => {
       form.listState.finished = true

src/views/unit-test/unit-list/models/unit-student-list.tsx

@@ -183,7 +183,7 @@ export default defineComponent({
             v-model:modelValue={form.listState.refreshing}
             onRefresh={onSearch}
             style={{
-              minHeight: `calc(100vh - ${form.listState.height}px)`
+              minHeight: `calc(50vh)`
             }}
           >
             <List
@@ -206,7 +206,9 @@ export default defineComponent({
                           <p class={[styles.name, 'van-ellipsis']}>
                             {item.studentName ? item.studentName : '--'}
                           </p>
-                          <div class={[styles.studentTag]}>{unitTestStatus[item.status]}</div>
+                          <div class={[styles.studentTag, styles[item.status]]}>
+                            {unitTestStatus[item.status]}
+                          </div>
                         </div>
 
                         <p class={styles.phone}>{item.submitTime}</p>

src/views/unit-test/unit-list/models/unit-student.module.less

@@ -37,15 +37,24 @@
         padding: 0 8px;
         color: #fff;
         margin-left: 6px;
+        font-weight: 500;
+        font-size: 12px;
       }
       .A_PASS {
-        background-color: #ff8057;
-      }
-      .D_NO_SUBMIT {
-        background-color: #8f80ff;
+        background: rgba(255, 128, 87, 0.18);
+        color: #f67146;
       }
       .B_NO_PASS {
-        background-color: #ff5c5f;
+        background: rgba(255, 92, 95, 0.18);
+        color: #f67146;
+      }
+      .C_ING {
+        background: rgba(96, 218, 161, 0.18);
+        color: #4ab78e;
+      }
+      .D_NO_SUBMIT {
+        background: rgba(100, 169, 255, 0.18);
+        color: #64a9ff;
       }
     }
     .img {