Merge branch 'iteration-20240530-http' into online

src/helpers/utils.ts

@@ -140,10 +140,10 @@ export function vaildTeachingUrl() {
   let returnUrl = '';
   if (/dev/.test(url)) {
     // dev 环境
-    returnUrl = 'http://dev.gym.lexiaoya.cn';
+    returnUrl = 'https://dev.gym.lexiaoya.cn';
   } else if (/test/.test(url)) {
     // dev 环境
-    returnUrl = 'http://test.gym.lexiaoya.cn';
+    returnUrl = 'https://test.gym.lexiaoya.cn';
   } else {
     // 默认线上环境
     returnUrl = 'https://gym.lexiaoya.cn';

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

@@ -233,13 +233,23 @@
             .content {
               font-size: 14px;
               font-weight: 600;
-
               color: #131415;
 
-              span {
+              .name {
+                padding-right: 12px;
+                white-space: word-wrap;
+              }
+
+              .more {
                 color: #13a9ff;
-                margin-left: 12px;
                 white-space: nowrap;
+
+                :global {
+                  .van-icon {
+                    font-size: 12px;
+                    font-weight: bold;
+                  }
+                }
               }
             }
           }
@@ -623,7 +633,7 @@
   .codeImg {
     position: relative;
     width: 315px;
-    height: 480px;
+    // height: 480px;
     z-index: 9;
     // background: url('./images/week/popup-week-banner.png') no-repeat top center;
     // background-size: contain;
@@ -645,7 +655,7 @@
     &.teacherCodeImg {
       // background: url('./images/month/popup-week-banner.png') no-repeat top center;
       // background-size: contain;
-      background-color: #ffffff;
+      background-color: #AFEEDD;
     }
 
     .headerContantPopup {
@@ -689,7 +699,7 @@
     .codeContent {
       position: relative;
       background-color: #fff;
-      margin: 176px 24px 28px;
+      margin: 162px 24px 28px;
       border-radius: 16px;
       padding-bottom: 18px;
 
@@ -712,23 +722,27 @@
         color: #000000;
         line-height: 22px;
         font-size: 16px;
+        // padding: 0 25px;
+        padding-left: 25px;
+        padding-right: 25px;
       }
 
       .shareName {
         padding-top: 4px;
         font-size: 14px;
-
         font-weight: 600;
         color: #1b93ff;
         line-height: 20px;
         text-align: center;
-        padding-bottom: 12px;
+        padding-bottom: 10px;
+        padding-left: 25px;
+        padding-right: 25px;
       }
 
       .shareBottom {
-        width: 194px;
-        height: 38px;
-        margin: 16px auto 0;
+        width: 175px;
+        height: 35px;
+        margin: 10px auto 0;
         display: block;
       }
 
@@ -791,10 +805,10 @@
 
   .codeBottom {
     position: relative;
-    margin-top: 32px;
+    margin-top: 22px;
     background: #ffffff;
     border-radius: 20px 20px 0px 0px;
-    padding-bottom: 10px;
+    // padding-bottom: 10px;
   }
 
   .title {

src/views/activity-record/detail.tsx

@@ -15,7 +15,14 @@ import {
   Grid,
   GridItem
 } from 'vant';
-import { defineComponent, nextTick, onMounted, reactive, ref } from 'vue';
+import {
+  defineComponent,
+  nextTick,
+  onMounted,
+  onUnmounted,
+  reactive,
+  ref
+} from 'vue';
 import styles from './detail.module.less';
 import { browser, toChinesNum } from '@/helpers/utils';
 import SOLO from './images/SOLO.png';
@@ -144,7 +151,7 @@ export default defineComponent({
     };
 
     const formatterImage = (name: string) => {
-      let image: string = '';
+      let image = '';
       switch (name) {
         case 'SOLO':
           image = dBall;
@@ -166,12 +173,22 @@ export default defineComponent({
     };
 
     onMounted(() => {
+      postMessage({
+        api: 'setStatusBarTextColor',
+        content: { statusBarTextColor: true }
+      });
       // setTimeout(() => {
       //   // forms.headerLoading = false;
       //   // forms.detailLoading = false;
       // }, 1000);
       getDetail();
     });
+    onUnmounted(() => {
+      postMessage({
+        api: 'setStatusBarTextColor',
+        content: { statusBarTextColor: false }
+      });
+    });
     const imgs = reactive({
       saveLoading: false,
       image: null as any,
@@ -379,7 +396,6 @@ export default defineComponent({
           <div class={styles.wall}> </div>
           <Image src={jiemuIcon} class={styles.jiemuIcon}></Image>
           <div class={styles.typeCard}>
-            {' '}
             {activityStatus[forms.headerDetail.type]}
           </div>
           <SkeletionIndexModal
@@ -446,13 +462,14 @@ export default defineComponent({
                         表演乐团：
                       </Col>
                       <Col span={18} class={styles.content}>
-                        {item.musicGroupName}
+                        <span class={styles.name}>{item.musicGroupName}</span>
                         <span
+                          class={styles.more}
                           onClick={() => {
                             if (item.studentNum <= 0) return;
                             formatterStudentList(item.studentList);
                           }}>
-                          共{item.studentNum}名 <Icon name="arrow" />
+                          共{item.studentNum}名<Icon name="arrow" />
                         </span>
                       </Col>
                     </Row>
@@ -632,10 +649,12 @@ export default defineComponent({
                     objectFit: 'cover'
                   }}
                 />
-                <div class={styles.schoolName}>
+                <div class={[styles.schoolName, 'van-multi-ellipsis--l2']}>
                   {forms.headerDetail?.cooperationOrganName || '--'}
                 </div>
-                <div class={styles.shareName}>{forms.headerDetail.name}</div>
+                <div class={[styles.shareName, 'van-ellipsis']}>
+                  {forms.headerDetail.name}
+                </div>
                 <div class={styles.codeQr}>
                   <Image src={popupQrcodeBg} class={styles.popupQrcodeBg} />
                   <MQrcode

vite.config.ts

@@ -13,7 +13,7 @@ function resolve(dir: string) {
 }
 // https://vitejs.dev/config/
 // https://github.com/vitejs/vite/issues/1930 .env
-const proxyUrl = 'https://dev.dayaedu.com/';
+const proxyUrl = 'https://test.gym.lexiaoya.cn/';
 export default defineConfig({
   base: './',
   plugins: [