mo 2 سال پیش
والد
کامیت
4a823ff809
3فایلهای تغییر یافته به همراه54 افزوده شده و 58 حذف شده
  1. 39 41
      src/views/activity-record/detail-swiper.tsx
  2. 13 14
      src/views/activity-record/detail.module.less
  3. 2 3
      src/views/activity-record/detail.tsx

+ 39 - 41
src/views/activity-record/detail-swiper.tsx

@@ -45,46 +45,43 @@ export default defineComponent({
             space-between={10}
             pagination={true}
             thumbs={{ swiper: thumbsSwiper.value }}>
-            {props.item.attachmentUrl.map(
-              (i: any, index: number) =>
-                index <= 3 && (
-                  <SwiperSlide class="slide">
-                    <div
-                      class={styles.photo}
-                      onClick={() => {
-                        emit('showImageToas', {
-                          imagePreview: props.item.attachmentUrl,
-                          imageShow: true,
-                          startPosition: index
-                        });
-                        // forms.imagePreview = item.attachmentUrl;
-                        // forms.imageShow = true;
-                        // forms.startPosition = index;
-                      }}>
-                      {checkFile(i, 'image') ? (
-                        <Image src={i + '@base@tag=imgScale'} fit="cover" />
-                      ) : (
-                        <div class={styles.videoWErap}>
-                          <Image src={palyBtn} class={styles.palyBtn}></Image>
-                          <video
-                            style={{ backgroundColor: '#F8F8F8' }}
-                            poster={iconVideoDefault}
-                            src={i + '#t=1,4'}
-                          />
-                        </div>
-                      )}
+            {props.item.attachmentUrl.map((i: any, index: number) => (
+              <SwiperSlide class="slide">
+                <div
+                  class={styles.photo}
+                  onClick={() => {
+                    emit('showImageToas', {
+                      imagePreview: props.item.attachmentUrl,
+                      imageShow: true,
+                      startPosition: index
+                    });
+                    // forms.imagePreview = item.attachmentUrl;
+                    // forms.imageShow = true;
+                    // forms.startPosition = index;
+                  }}>
+                  {checkFile(i, 'image') ? (
+                    <Image src={i + '@base@tag=imgScale'} fit="cover" />
+                  ) : (
+                    <div class={styles.videoWErap}>
+                      <Image src={palyBtn} class={styles.palyBtn}></Image>
+                      <video
+                        style={{ backgroundColor: '#F8F8F8' }}
+                        poster={iconVideoDefault}
+                        src={i + '#t=1,4'}
+                      />
+                    </div>
+                  )}
 
-                      {props.item.attachmentUrl.length > 4 && index === 3 ? (
-                        <div class={styles.photoMore}>
-                          +{props.item.attachmentUrl.length - 4}
-                        </div>
-                      ) : (
-                        ''
-                      )}
+                  {props.item.attachmentUrl.length > 4 && index === 3 ? (
+                    <div class={styles.photoMore}>
+                      +{props.item.attachmentUrl.length - 4}
                     </div>
-                  </SwiperSlide>
-                )
-            )}
+                  ) : (
+                    ''
+                  )}
+                </div>
+              </SwiperSlide>
+            ))}
           </Swiper>
           <div class={styles.thumbsWrap}>
             <div
@@ -96,7 +93,9 @@ export default defineComponent({
                   startPosition: 0
                 });
               }}>
-              全部
+              <p>全</p>
+              <p>部</p>
+
               <Image class={styles.arrayIcon} src={arrayIcon}></Image>
             </div>
             <Swiper
@@ -105,8 +104,7 @@ export default defineComponent({
               space-between={10}
               slides-per-view={4}
               watch-slides-progress={true}
-              prevent-clicks={true}
-              prevent-clicks-propagation={false}
+              freeMode={true}
               onSwiper={setThumbsSwiper}>
               {props.item.attachmentUrl.map(
                 (i: any, index: number) =>

+ 13 - 14
src/views/activity-record/detail.module.less

@@ -11,7 +11,7 @@
       width: 100%;
       height: 30px;
       top: 18px;
-      z-index: 500;
+      z-index: 600;
       padding: 0 16px;
       position: fixed;
       display: flex;
@@ -45,7 +45,7 @@
       margin-top: 11px;
       text-align: center;
       line-height: 29px;
-      font-weight: 500;
+      font-weight: 600;
       color: #ffffff;
       font-size: 14px;
       margin-bottom: 43px;
@@ -99,7 +99,7 @@
         margin: 12px auto 12px;
         text-align: center;
         line-height: 26px;
-        font-weight: 500;
+        font-weight: 600;
         color: #1b93ff;
       }
     }
@@ -142,7 +142,7 @@
           width: 311px;
           min-height: 151px;
           margin: 15px auto 20px;
-          border-radius: 16px;OQrcode
+          border-radius: 16px;
           z-index: 200;
           padding: 10px 10px 15px;
           .ballIcon {
@@ -178,6 +178,7 @@
               position: relative;
               z-index: 80;
               padding-right: 5px;
+              font-size: 15px;
               &:after {
                 content: '';
                 width: 14px;
@@ -209,12 +210,12 @@
             margin-top: 12px;
             .label {
               font-size: 14px;
-              font-weight: 500;
+              font-weight: 600;
               color: #6a7169;
             }
             .content {
               font-size: 14px;
-              font-weight: 500;
+              font-weight: 600;
               color: #131415;
               span {
                 color: #13a9ff;
@@ -293,13 +294,10 @@
                 height: 44px;
                 img {
                   display: block;
-                  width: 62px;
-                  height: 42px;
+
                   object-fit: cover !important;
                 }
                 video {
-                  width: 62px;
-                  height: 43px;
                 }
               }
             }
@@ -349,7 +347,7 @@
               align-items: center;
               justify-content: center;
               font-size: 11px;
-              font-weight: 500;
+              font-weight: 600;
               color: #131415;
               text-align: center;
               top: 0;
@@ -381,6 +379,7 @@
           background-size: 200px 43px;
           z-index: 100;
           // margin: 20px 15px 12px;
+          font-weight: 600;
           text-align: center;
         }
       }
@@ -492,7 +491,7 @@
     }
 
     .content {
-      font-weight: 500;
+      font-weight: 600;
 
       span {
         font-size: 14px;
@@ -557,7 +556,7 @@
     position: absolute;
     left: 25px;
     top: 83px;
-    font-weight: 500;
+    font-weight: 600;
     color: #ffffff;
     font-size: 12px;
   }
@@ -637,7 +636,7 @@
       .schoolName {
         padding-top: 36px;
         text-align: center;
-        font-weight: 500;
+        font-weight: 600;
         color: #000000;
         line-height: 22px;
         font-size: 16px;

+ 2 - 3
src/views/activity-record/detail.tsx

@@ -572,10 +572,9 @@ export default defineComponent({
             </div>
             <div class={styles.bottomWrap}>
               {browser().isApp ? null : (
-                <Image class={styles.bottomBg} src={bottomBg}></Image>
+                <Image class={styles.logo} src={logo}></Image>
               )}
-
-              <Image class={styles.logo} src={logo}></Image>
+              <Image class={styles.bottomBg} src={bottomBg}></Image>
             </div>
           </div>
         </SkeletionDetailModal>