修改样式

src/components/m-image-preview/index.module.less

@@ -10,8 +10,8 @@
 
   :global {
     .van-image-preview__cover {
-      top: calc(var(--van-padding-md) + constant(safe-area-inset-bottom));
-      top: calc(var(--van-padding-md) + env(safe-area-inset-bottom));
+      // top: calc(var(--van-padding-md) + constant(safe-area-inset-bottom));
+      // top: calc(var(--van-padding-md) + env(safe-area-inset-bottom));
       right: var(--van-image-preview-close-icon-margin);
       left: initial;
       font-size: 32px;

src/components/m-image-preview/index.tsx

@@ -22,6 +22,7 @@ import iconPreviewDownload from '@/common/images/icon-preview-download.png';
 import { promisefiyPostMessage } from '@/helpers/native-message';
 import { checkFile } from '@/helpers/toolsValidate';
 import MVideo from '../m-video';
+import { state } from '@/state';
 
 export default defineComponent({
   name: 'm-image-preview',
@@ -111,6 +112,14 @@ export default defineComponent({
         forms.index = props.startPosition + 1;
       }
     );
+
+    onMounted(() => {
+      // navBarHeight;
+      // document.documentElement.style.setProperty(
+      //   '--header-height',
+      //   height + 'px'
+      // );
+    });
     return () => (
       <Popup
         teleport={props.teleport}
@@ -120,18 +129,34 @@ export default defineComponent({
         <Icon
           name={iconPreviewClose}
           class="van-image-preview__close-icon van-image-preview__close-icon--top-left van-haptics-feedback"
+          style={{
+            top: state.navBarHeight
+              ? state.navBarHeight + 'px'
+              : 'var(--van-padding-md)'
+          }}
           onClick={() => {
             onPlay(-1);
             emit('update:show', false);
           }}
         />
-        <div class={'van-image-preview__index'}>
+        <div
+          class={'van-image-preview__index'}
+          style={{
+            top: state.navBarHeight
+              ? state.navBarHeight + 'px'
+              : 'var(--van-padding-md)'
+          }}>
           {forms.index} / {props.images.length}
         </div>
         {props.showDownload ? (
           <Icon
             name={iconPreviewDownload}
             class="van-image-preview__close-icon van-image-preview__close-icon--top-right van-haptics-feedback"
+            style={{
+              top: state.navBarHeight
+                ? state.navBarHeight + 'px'
+                : 'var(--van-padding-md)'
+            }}
             onClick={() => {
               console.log(forms.index, 'index', props.images[forms.index - 1]);
 

src/components/m-protocol/index.module.less

@@ -4,6 +4,7 @@
   font-size: 12px;
   padding: 15px 14px;
   color: var(--k-gray-4);
+
   .protocolText {
     color: var(--van-primary);
     line-height: 15px;
@@ -13,20 +14,24 @@
     background: transparent !important;
     width: 15px;
     height: 15px;
+    font-size: 15px;
     border: transparent !important;
   }
+
   :global {
     .van-checkbox {
       display: inline-block;
       align-items: inherit;
       overflow: inherit;
     }
+
     .van-checkbox__icon {
       height: 15px;
       line-height: 15px;
       display: inline-block;
       vertical-align: sub;
     }
+
     .van-checkbox__label {
       line-height: 15px;
       color: var(--k-gray-4);
@@ -39,4 +44,4 @@
     color: #333;
     line-height: 1.4;
   }
-}
+}

src/components/m-search/index.module.less

@@ -28,7 +28,7 @@
   &.default {
     :global {
       .van-search__content {
-        background: #f6f6f6 !important;
+        background: #f8f9fc !important;
       }
     }
   }

src/components/m-uploader/index.module.less

@@ -12,7 +12,7 @@
     top: 5px;
     right: 12px;
     z-index: 99;
-    font-size: 10px;
+    font-size: 12px;
     background-color: rgba(0, 0, 0, 0.4);
     color: #fff;
     font-weight: bold;

src/router/router-root.ts

@@ -5,7 +5,7 @@ export default [
     name: 'school-register',
     component: () => import('@/views/school-register/index'),
     meta: {
-      title: '乐团注册'
+      title: ' '
     }
   },
   {

src/router/routes-common.ts

@@ -159,7 +159,7 @@ export default [
         name: 'lesson-list',
         component: () => import('@/views/lesson-list/index'),
         meta: {
-          title: '课时列表'
+          title: '课程列表'
         }
       },
       {
@@ -167,7 +167,7 @@ export default [
         name: 'lesson-detail',
         component: () => import('@/views/lesson-list/detail'),
         meta: {
-          title: '课时详情'
+          title: '课程详情'
         }
       }
     ]

src/styles/index.less

@@ -51,6 +51,11 @@ body {
   --van-dropdown-menu-height: 44px;
 }
 
+.van-dropdown-item {
+  // 在某些浏览器上面会显示一条线
+  margin-top: -1px;
+}
+
 .van-dropdown-item__content {
   border-radius: 0px 0px 12px 12px;
 
@@ -95,7 +100,7 @@ body {
 
     .van-cell__title {
       font-weight: 600;
-      color: var(--k-gray-1);
+      color: var(--k-font-primary);
     }
   }
 }
@@ -117,6 +122,7 @@ body {
   .van-button {
     font-weight: 400;
     width: 48%;
+    font-size: 16px;
   }
 }
 

src/views/activity-record/components/performance-team.tsx

@@ -68,7 +68,7 @@ export default defineComponent({
                   e.stopPropagation();
                 }}
               />
-              {item.subjectName}
+              <span class={'van-ellipsis'}>{item.subjectName}</span>
             </Tag>
           ))}
         </CheckboxGroup>

src/views/activity-record/detail.module.less

@@ -131,11 +131,18 @@
       .van-image {
         width: inherit;
         height: inherit;
-        border-radius: 2px;
+        border-radius: 4px;
         overflow: hidden;
       }
     }
 
+    video {
+      width: inherit;
+      height: inherit;
+      border-radius: 4px;
+      overflow: hidden;
+    }
+
     .photoMore {
       position: absolute;
       top: 0;

src/views/activity-record/detail.tsx

@@ -18,6 +18,8 @@ import { formatterTimer } from './operation';
 import MPopup from '@/components/m-popup';
 import CastModal from './components/cast-modal';
 import iconEdit from './images/icon-edit.png';
+import { checkFile } from '@/helpers/toolsValidate';
+import iconVideoDefault from '@common/images/icon-video-c.png';
 
 export default defineComponent({
   name: 'detail-page',
@@ -203,10 +205,10 @@ export default defineComponent({
                   class={styles.moreCell}
                   valueClass={styles.valueClass}>
                   <Row class={styles.item}>
-                    <Col span={5} class={styles.label}>
+                    <Col span={6} class={styles.label}>
                       表演乐团
                     </Col>
-                    <Col span={19} class={styles.content}>
+                    <Col span={18} class={styles.content}>
                       {item.musicGroupName}
                       <span
                         onClick={() => {
@@ -218,10 +220,10 @@ export default defineComponent({
                     </Col>
                   </Row>
                   <Row class={styles.item} style={{ marginBottom: '0' }}>
-                    <Col span={5} class={styles.label}>
+                    <Col span={6} class={styles.label}>
                       表演团队
                     </Col>
-                    <Col span={19} class={styles.content}>
+                    <Col span={18} class={styles.content}>
                       {item.subjectNameList}
                     </Col>
                   </Row>
@@ -237,10 +239,19 @@ export default defineComponent({
                                 forms.imageShow = true;
                                 forms.startPosition = index;
                               }}>
-                              <Image
-                                src={i + '@base@tag=imgScale&w=120'}
-                                fit="cover"
-                              />
+                              {checkFile(i, 'image') ? (
+                                <Image
+                                  src={i + '@base@tag=imgScale&w=120'}
+                                  fit="cover"
+                                />
+                              ) : (
+                                <video
+                                  style={{ backgroundColor: '#F8F8F8' }}
+                                  poster={iconVideoDefault}
+                                  src={i + '#t=1,4'}
+                                />
+                              )}
+
                               {item.attachmentUrl.length > 4 && index === 3 ? (
                                 <div class={styles.photoMore}>
                                   +{item.attachmentUrl.length - 4}

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

@@ -55,6 +55,10 @@
     .ing {
       color: var(--k-font-primary);
     }
+
+    .end {
+      color: var(--k-gray-4)
+    }
   }
 }
 
@@ -68,12 +72,17 @@
       z-index: 1;
     }
 
+    .van-tab--shrink {
+      padding: 0 10px;
+    }
+
     .van-tabs__line {
       bottom: 26px;
       width: 45px;
       height: 6px;
       background: linear-gradient(250deg, rgba(45, 199, 170, 0.22) 0%, #2DC7AA 100%);
       z-index: 0;
+      border-radius: 0;
     }
   }
 
@@ -91,8 +100,7 @@
 
     .boxStyle {
       background: transparent !important;
-      width: 18px;
-      height: 18px;
+      font-size: 18px;
       border: transparent !important;
     }
 
@@ -115,5 +123,18 @@
         color: var(--k-gray-4);
       }
     }
+
+    .infoTitle {
+      font-size: 16px;
+      font-weight: 600;
+      color: var(--k-gray-1);
+      line-height: 22px;
+    }
+
+    .infoContent {
+      font-size: 14px;
+      color: var(--k-gray-3);
+      line-height: 20px;
+    }
   }
 }

src/views/activity-record/index.tsx

@@ -205,7 +205,8 @@ export default defineComponent({
                       )}`}
                       value={activeStatus[item.status]}
                       valueClass={
-                        item.status === 'PROCESSING' ? styles.ing : ''
+                        (item.status === 'PROCESSING' ? styles.ing : '',
+                        item.status === 'END' ? styles.end : '')
                       }></Cell>
                   </CellGroup>
                 ))

src/views/activity-record/operation.module.less

@@ -13,7 +13,7 @@
     }
 
     .van-field__control {
-      // font-weight: 600;
+      font-weight: 600;
     }
   }
 }
@@ -51,7 +51,7 @@
   .closeable {
     position: absolute;
     right: 6px;
-    font-size: 8px;
+    font-size: 12px;
   }
 }
 
@@ -89,6 +89,9 @@
         font-size: 13px;
         justify-content: center;
         border-radius: 6px;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        overflow: hidden;
 
         &+.van-tag {
           margin-left: 8px;
@@ -267,7 +270,7 @@
         margin-right: 20px;
 
         input {
-
+          font-size: 18px;
           text-align: center;
         }
 

src/views/lesson-list/components/component.module.less

@@ -72,6 +72,11 @@
       color: #5099F5;
       background: rgba(100, 169, 255, 0.18);
     }
+
+    .default {
+      color: #333;
+      background: #f7f7f7;
+    }
   }
 
   .after {
@@ -95,7 +100,7 @@
     }
 
     .txt {
-      padding-top: 5px;
+      padding-top: 0px;
     }
   }
 }

src/views/lesson-list/components/student.tsx

@@ -68,9 +68,13 @@ export default defineComponent({
                   title: () => (
                     <div class={styles.userInfo}>
                       <p class={styles.name}>{item.studentName}</p>
-                      <span class={styles[item.attendanceStatus]}>
-                        {clockingIn[item.attendanceStatus]}
-                      </span>
+                      {item.courseStatus === 'NOT_START' ? (
+                        <span>未点名</span>
+                      ) : (
+                        <span class={styles[item.attendanceStatus]}>
+                          {clockingIn[item.attendanceStatus]}
+                        </span>
+                      )}
                     </div>
                   ),
                   value: () => (

src/views/lesson-list/index.module.less

@@ -119,6 +119,10 @@
         &:last-child {
           margin-right: 0;
           padding-right: 0;
+
+          &::after {
+            display: none;
+          }
         }
       }
     }
@@ -170,6 +174,7 @@
       height: 6px;
       background: linear-gradient(250deg, rgba(45, 199, 170, 0.22) 0%, #2DC7AA 100%);
       z-index: 0;
+      border-radius: 0;
     }
   }
 }

src/views/mass-message/index.module.less

@@ -7,6 +7,20 @@
     .van-uploader {
       --upload-file-size: 100px !important;
     }
+
+    .van-field__word-limit {
+      position: absolute;
+      top: -38px;
+      right: 0;
+      color: var(--k-gray-4);
+      font-size: 14px;
+    }
+  }
+
+  .content {
+    padding: 0;
+    margin-top: 0px;
+    overflow: visible;
   }
 
   .title {
@@ -26,8 +40,8 @@
   }
 
   .imgLogo {
-    width: 42px;
-    height: 42px;
+    width: 48px;
+    height: 48px;
     overflow: hidden;
     border-radius: 50%;
     margin-right: 8px;
@@ -52,7 +66,7 @@
 
     .iconBadge {
       width: 56px;
-      height: 20px;
+      height: 18px;
       margin-left: 4px;
     }
 
@@ -87,6 +101,7 @@
       height: 6px !important;
       background: linear-gradient(250deg, rgba(45, 199, 170, 0.22) 0%, #2DC7AA 100%);
       z-index: 0;
+      border-radius: 0;
     }
   }
 }
@@ -106,6 +121,7 @@
     background: transparent !important;
     width: 18px;
     height: 18px;
+    font-size: 18px;
     border: transparent !important;
   }
 

src/views/mass-message/index.tsx

@@ -16,7 +16,7 @@ import MUploader from '@/components/m-uploader';
 import MPopup from '@/components/m-popup';
 import SelectSend from './select-send';
 import iconUploader from './images/icon-uploader.png';
-import iconClose from '@/common/images/icon-upload-close.png';
+import iconClose from '@/common/images/icon-upload-close2.png';
 import iconContent from './images/icon-content.png';
 import iconFile from './images/icon-file.png';
 import iconUsers from './images/icon-users.png';
@@ -131,7 +131,7 @@ export default defineComponent({
               ),
               label: () => (
                 <Field
-                  style={{ padding: '0', marginTop: '12px' }}
+                  class={styles.content}
                   placeholder="请输入您的消息内容"
                   v-model={forms.messageContent}
                   type="textarea"

src/views/patrol-evaluation/detail-list.tsx

@@ -36,6 +36,7 @@ import { useRoute } from 'vue-router';
 import MImagePreview from '@/components/m-image-preview';
 import { checkFile } from '@/helpers/toolsValidate';
 import deepClone from '@/helpers/deep-clone';
+import iconVideoDefault from '@common/images/icon-video-c.png';
 
 export default defineComponent({
   name: 'detail-list',
@@ -404,6 +405,7 @@ export default defineComponent({
                                         />
                                       ) : (
                                         <video
+                                          poster={iconVideoDefault}
                                           src={file + '#t=1,4'}
                                           controls={false}></video>
                                       )}

src/views/teacher-attendance/detail.tsx

@@ -36,8 +36,8 @@ export default defineComponent({
       ],
       typeColumns: [{ text: '全部类型', value: '' }],
       params: {
-        courseScheduleType: '',
-        signInStatus: ''
+        courseType: '',
+        signStatus: ''
       },
       teacherInfo: {} as any,
       list: []
@@ -51,7 +51,7 @@ export default defineComponent({
       if (type === 'orchestra') {
         let name = '';
         forms.typeColumns.forEach((item: any) => {
-          if (forms.params.courseScheduleType === item.value) {
+          if (forms.params.courseType === item.value) {
             name = item.text;
           }
         });
@@ -197,7 +197,7 @@ export default defineComponent({
 
         <DropdownMenu>
           <DropdownItem
-            v-model={forms.params.signInStatus}
+            v-model={forms.params.signStatus}
             options={forms.classColumns as any}
             onChange={() => {
               forms.listState.dataShow = true;
@@ -206,12 +206,12 @@ export default defineComponent({
             }}></DropdownItem>
           <DropdownItem ref={dropDownItemRef1} title={formatName('orchestra')}>
             <DropDownModal
-              selectValues={forms.params.courseScheduleType}
+              selectValues={forms.params.courseType}
               columns={forms.typeColumns}
               open={dropDownItemRef1.value.state.showPopup}
               onDropDownClose={() => onDropDownClose(dropDownItemRef1)}
               onDropDownConfirm={(values: any) => {
-                forms.params.courseScheduleType = values[0];
+                forms.params.courseType = values[0];
                 onDropDownClose(dropDownItemRef1);
                 forms.listState.dataShow = true;
                 forms.list = [];

src/views/teacher-attendance/index.module.less

@@ -71,7 +71,7 @@
 
   .classAttendance {
     .value {
-      font-size: 18px;
+      font-size: 16px;
 
       span {
         font-size: 12px;