修复问题

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

@@ -16,5 +16,9 @@
       left: initial;
       font-size: 32px;
     }
+
+    .van-image-preview__index {
+      z-index: var(--van-image-preview-close-icon-z-index);
+    }
   }
 }

src/components/m-search/index.tsx

@@ -57,6 +57,7 @@ export default defineComponent({
         placeholder={props.placeholder}
         disabled={props.disabled}
         autofocus={props.autofocus}
+        autocomplete="off"
         v-model={forms.search}
         clearTrigger="always"
         onClear={() => {

src/components/m-uploader/index.tsx

@@ -81,12 +81,19 @@ export default defineComponent({
         return;
       }
       const type = this.uploadType === 'VIDEO' ? 'video' : 'img';
+
+      let imgCount = 1;
+      if (this.maxCount > 1) {
+        imgCount = this.maxCount - this.modelValue.length;
+      } else {
+        imgCount = this.maxCount;
+      }
       postMessage(
         {
           api: 'chooseFile',
           content: {
             type: type,
-            max: this.maxCount,
+            max: imgCount,
             bucket: this.bucket,
             path: this.path
           }
@@ -94,10 +101,17 @@ export default defineComponent({
         (res: any) => {
           console.log(res, 'fileUrl');
           // 判断是否是多选
-          const files = res.fileUrl;
           if (this.maxCount > 1) {
-            this.$emit('update:modelValue', [...this.modelValue, res.fileUrl]);
-            this.$emit('uploadChange', [...this.modelValue, res.fileUrl]);
+            const files = res.fileUrl;
+            console.log(files, 'files');
+            this.$emit('update:modelValue', [
+              ...this.modelValue,
+              ...files.split(',')
+            ]);
+            this.$emit('uploadChange', [
+              ...this.modelValue,
+              ...files.split(',')
+            ]);
           } else {
             this.$emit('update:modelValue', [res.fileUrl]);
             this.$emit('uploadChange', [res.fileUrl]);

src/components/m-uploader/inside.tsx

@@ -81,12 +81,18 @@ export default defineComponent({
         return;
       }
       const type = this.uploadType === 'VIDEO' ? 'video' : 'img';
+      let imgCount = 1;
+      if (this.maxCount > 1) {
+        imgCount = this.maxCount - this.modelValue.length;
+      } else {
+        imgCount = this.maxCount;
+      }
       postMessage(
         {
           api: 'chooseFile',
           content: {
             type: type,
-            max: this.maxCount,
+            max: imgCount,
             bucket: this.bucket,
             path: this.path
           }
@@ -95,8 +101,16 @@ export default defineComponent({
           console.log(res, 'fileUrl');
           // 判断是否是多选
           if (this.maxCount > 1) {
-            this.$emit('update:modelValue', [...this.modelValue, res.fileUrl]);
-            this.$emit('uploadChange', [...this.modelValue, res.fileUrl]);
+            const files = res.fileUrl;
+            console.log(files, 'files');
+            this.$emit('update:modelValue', [
+              ...this.modelValue,
+              ...files.split(',')
+            ]);
+            this.$emit('uploadChange', [
+              ...this.modelValue,
+              ...files.split(',')
+            ]);
           } else {
             this.$emit('update:modelValue', [res.fileUrl]);
             this.$emit('uploadChange', [res.fileUrl]);

src/views/activity-record/components/cast-item.tsx

@@ -110,7 +110,7 @@ export default defineComponent({
                   <Image
                     src={item.studentAvatar || iconStudent}
                     class={styles.imgLogo}
-                    fit="contain"
+                    fit="cover"
                   />
                 ),
                 title: () => (

src/views/activity-record/detail.tsx

@@ -239,7 +239,7 @@ export default defineComponent({
                               }}>
                               <Image
                                 src={i + '@base@tag=imgScale&w=120'}
-                                fit="contain"
+                                fit="cover"
                               />
                               {item.attachmentUrl.length > 4 && index === 3 ? (
                                 <div class={styles.photoMore}>

src/views/activity-record/index.tsx

@@ -38,6 +38,8 @@ export default defineComponent({
         refreshing: false
       },
       params: {
+        type: '',
+        keyword: '',
         page: 1,
         rows: 20
       },
@@ -49,7 +51,7 @@ export default defineComponent({
     const formatName = () => {
       let name = '';
       forms.activeColumns.forEach((item: any) => {
-        if (forms.activeValue === item.value) {
+        if (forms.params.type === item.value) {
           name = item.text;
         }
       });
@@ -64,10 +66,6 @@ export default defineComponent({
           data: forms.params
         });
         const result = data || {};
-        // 处理重复请求数据
-        if (forms.list.length > 0 && result.pageNo === 1) {
-          return;
-        }
         // 判断是否有数据
         if (forms.listState.refreshing) {
           forms.list = result.rows || [];
@@ -130,7 +128,13 @@ export default defineComponent({
               )
             }}
           </MHeader>
-          <MSearch placeholder="请输入活动名称">
+          <MSearch
+            placeholder="请输入活动名称"
+            onSearch={(val: string) => {
+              forms.params.keyword = val;
+              forms.listState.refreshing = true;
+              onRefresh();
+            }}>
             {{
               left: () => (
                 <DropdownMenu
@@ -138,13 +142,15 @@ export default defineComponent({
                   closeOnClickOutside={false}>
                   <DropdownItem title={formatName()} ref={dropDownRef}>
                     <DropDownModal
-                      selectValues={forms.activeValue}
+                      selectValues={forms.params.type}
                       columns={forms.activeColumns}
                       open={dropDownRef.value.state.showPopup}
                       onDropDownClose={() => onDropDownClose(dropDownRef)}
                       onDropDownConfirm={(values: any) => {
-                        forms.activeValue = values[0];
+                        forms.params.type = values[0];
                         onDropDownClose(dropDownRef);
+                        forms.listState.refreshing = true;
+                        onRefresh();
                       }}
                     />
                   </DropdownItem>

src/views/activity-record/operation.tsx

@@ -303,7 +303,7 @@ export default defineComponent({
       for (let i = 0, j = forms.detail.length; i < j; i++) {
         const tDetail = forms.detail[i];
         if (!tDetail.name) {
-          showToast('请输入节目名称不能为空');
+          showToast('节目名称不能为空');
           return false;
         }
         if (!tDetail.type) {

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

@@ -88,7 +88,7 @@ export default defineComponent({
                       <Image
                         src={item.avatar || iconStudent}
                         class={styles.iconStudent}
-                        fit="contain"
+                        fit="cover"
                       />
                       {item.memberFlag && (
                         <Icon name={iconMember} class={styles.iconMember} />

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

@@ -76,7 +76,7 @@ export default defineComponent({
                     <Image
                       src={item.avatar || iconStudent}
                       class={styles.iconStudent}
-                      fit="contain"
+                      fit="cover"
                     />
                     <Icon name={iconMember} class={styles.iconMember} />
                   </div>

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

@@ -58,7 +58,7 @@ export default defineComponent({
                       <Image
                         src={item.studentAvatar || iconStudent}
                         class={styles.iconStudent}
-                        fit="contain"
+                        fit="cover"
                       />
                       {item.memberFlag && (
                         <Icon name={iconMember} class={styles.iconMember} />

src/views/lesson-list/detail-modal/index.tsx

@@ -47,7 +47,7 @@ export default defineComponent({
                   <Image
                     src={forms.detail.avatar || iconStudent}
                     class={styles.iconStudent}
-                    fit="contain"
+                    fit="cover"
                   />
                   {forms.detail.memberFlag && (
                     <Icon name={iconMember} class={styles.iconMember} />

src/views/lesson-list/detail.tsx

@@ -66,7 +66,7 @@ export default defineComponent({
                 icon: () => (
                   <Image
                     src={forms.headerDetail.teacherAvatar || iconTeacher}
-                    fit="contain"
+                    fit="cover"
                     class={styles.iconStudent}
                   />
                 ),

src/views/lesson-list/index.tsx

@@ -78,7 +78,7 @@ export default defineComponent({
                     icon: () => (
                       <Image
                         src={item.teacherAvatar || iconTeacher}
-                        fit="contain"
+                        fit="cover"
                         class={styles.iconStudent}
                       />
                     ),

src/views/mass-message/components/contacts.tsx

@@ -172,7 +172,7 @@ export default defineComponent({
                           : iconStudent
                       }
                       class={styles.imgLogo}
-                      fit="contain"
+                      fit="cover"
                     />
                   ),
                   title: () => (

src/views/mass-message/components/group-chat.tsx

@@ -139,7 +139,7 @@ export default defineComponent({
                     <Image
                       src={formatterImage(item.type)}
                       class={styles.imgLogo}
-                      fit="contain"
+                      fit="cover"
                     />
                   ),
                   title: () => (

src/views/mass-message/index.tsx

@@ -189,11 +189,7 @@ export default defineComponent({
             <Cell center border={false}>
               {{
                 icon: () => (
-                  <Image
-                    src={item.avatar}
-                    class={styles.imgLogo}
-                    fit="contain"
-                  />
+                  <Image src={item.avatar} class={styles.imgLogo} fit="cover" />
                 ),
                 title: () => (
                   <div class={styles.infos}>

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

@@ -335,7 +335,7 @@ export default defineComponent({
                             <Image
                               src={item.teacherAvatar || iconTeacher}
                               class={styles.iconTeacher}
-                              fit="contain"
+                              fit="cover"
                             />
                           ),
                           title: () => (
@@ -478,11 +478,13 @@ export default defineComponent({
                             <MUploader
                               uploadIcon={iconUploadImg}
                               maxCount={5}
+                              native
                               v-model:modelValue={item.submitImgList}>
                               <MUploaderInside
                                 uploadIcon={iconUploadVideo}
                                 uploadType="VIDEO"
                                 accept=".mp4"
+                                native
                                 maxCount={3}
                                 v-model:modelValue={item.submitVideoList}
                               />

src/views/patrol-evaluation/index.tsx

@@ -59,10 +59,7 @@ export default defineComponent({
           }
         );
         const result = data || {};
-        // 处理重复请求数据
-        if (forms.list.length > 0 && result.pageNo === 1) {
-          return;
-        }
+
         // 判断是否有数据
         if (forms.listState.refreshing) {
           forms.list = result.rows || [];
@@ -157,6 +154,7 @@ export default defineComponent({
               onChange={() => {
                 formatTimer();
                 forms.listState.dataShow = true;
+                forms.listState.refreshing = true;
                 forms.params.page = 1;
                 getList();
               }}></DropdownItem>

src/views/site-management/index.tsx

@@ -264,7 +264,7 @@ export default defineComponent({
                               <Image
                                 src={item.teacherAvatar || iconTeacher}
                                 class={styles.iconTeacher}
-                                fit="contain"
+                                fit="cover"
                               />
                             ),
                             title: () => (

src/views/site-management/site-settings.tsx

@@ -189,7 +189,7 @@ export default defineComponent({
                           <Image
                             src={item.teacherAvatar || iconTeacher}
                             class={styles.iconTeacher}
-                            fit="contain"
+                            fit="cover"
                           />
                         ),
                         title: () => (

src/views/teacher-attendance/detail.tsx

@@ -141,7 +141,7 @@ export default defineComponent({
                 icon: () => (
                   <Image
                     src={forms.teacherInfo.teacherAvatar || iconTeacher}
-                    fit="contain"
+                    fit="cover"
                     class={styles.iconTeacher}
                   />
                 ),

src/views/teacher-attendance/index.tsx

@@ -66,7 +66,6 @@ export default defineComponent({
           '/api-web/schoolTeacherAttendance/queryTeacherAttendance',
           {
             data: {
-              coopId: 3,
               ...forms.params
             }
           }
@@ -187,7 +186,7 @@ export default defineComponent({
                       icon: () => (
                         <Image
                           src={item.teacherAvatar || iconTeacher}
-                          fit="contain"
+                          fit="cover"
                           class={styles.iconTeacher}
                         />
                       ),