Merge branch 'feature-2025-1-10' into jenkins-test

src/views/student-register/index-apply.module.less

@@ -183,6 +183,14 @@
   }
 }
 
+.paymentContainer2 {
+  :global {
+    .van-button {
+      width: 128px;
+    }
+  }
+}
+
 .studentSection {
   margin: 0 14px 8px;
   padding: 12px 15px;
@@ -908,13 +916,16 @@
       width: 75px;
       display: block;
       margin: 0 auto 10px;
+      position: relative;
+      transform: translateX(-9px);
     }
     .tipBtn {
       position: relative;
       margin-left: -10px;
+      margin-top: -8px;
       img {
         width: 190px;
-        height: 62px;
+        height: 72px;
         display: block;
         margin: 8px auto 0;
       }
@@ -925,10 +936,10 @@
         width: 100%;
         height: 100%;
         text-align: center;
-        padding: 13px;
         font-size: 18px;
         color: #fff;
         font-weight: 500;
+        line-height: 72px;
         i {
           font-style: normal;
         }
@@ -992,7 +1003,7 @@
       height: 80px;
       justify-content: space-between;
       overflow: hidden;
-      padding: 6px 0 4px;
+      padding: 8px 0 4px;
       >p {
         font-size: 16px;
         color: #000000;
@@ -1032,6 +1043,8 @@
     background: linear-gradient( 135deg, #EAFAFF 0%, #E6F2FF 100%);
     border-radius: 13px;
     display: flow-root;
+    position: relative;
+    overflow: hidden;
     .exTitle {
       background: #F0F8FF;
       border-radius: 13px 13px 0px 0px;
@@ -1057,6 +1070,9 @@
         border-radius: 4px;
         margin-right: 12px;
       }
+      .toolImgYq {
+        object-fit: contain;
+      }
       .toolRight {
         display: flex;
         flex-direction: column;
@@ -1073,7 +1089,8 @@
           overflow: hidden;
           word-break: break-all;
           white-space: nowrap;    
-          padding-right: 6px;      
+          padding-right: 6px;    
+          margin-top: -5px;  
         }
         .trDesc {
           font-size: 13px;
@@ -1106,6 +1123,13 @@
         z-index: 1;
       }  
     }
+    &>div:nth-of-type(2) {
+      margin-top: 5px;
+    }
+    .extTip {
+      width: 319px;
+      height: 34px;
+    }
   }
 
 }  

src/views/student-register/index-apply.tsx

@@ -74,9 +74,12 @@ import tipIcon3 from './images/tip3-icon.png';
 import tipBtnIcon from './images/tip-btn-icon.png';
 import giftBoxTitleIcon from './images/gift-box-title.png';
 import giftExtraTitleIcon from './images/gift-tip-icon.png';
+import giftExtraTitleIcon2 from './images/gift-tip-icon2.png';
 import giftCard1Icon from './images/gift_card1.png';
 import giftCard2Icon from './images/gift_card2.png';
 import giftZsIcon from './images/gift_zs_icon.png';
+import selectZsTip from './images/select_zs_tip.png';
+import useWeChatShare from '@/hooks/useWeChatShare';
 
 const classList: any = [];
 for (let i = 1; i <= 40; i++) {
@@ -126,6 +129,12 @@ const getGradeList = (gradeYear: string, instrumentCode?: string) => {
 export default defineComponent({
   name: 'student-register',
   setup() {
+    const weChatShare = useWeChatShare(
+      '音乐（器乐）数字AI团购通道',
+      '智慧旋律，告别枯燥练习。借助科技的光芒，我们让音乐跨越山海，抵达每一个角落，点亮每一颗童心',
+      window.location.origin + '/classroom-app/shareImg/instrument-share.png'
+    );
+
     const route = useRoute();
     const studentRegisterStore = useStudentRegisterStore();
     const router = useRouter();
@@ -1291,6 +1300,9 @@ export default defineComponent({
       } else {
         forms.code = code;
       }
+      // 获取微信分享签名
+      weChatShare.getAppSignature()
+
     }
 
     const formatTimerTo = (num: number): string => {
@@ -1426,8 +1438,9 @@ export default defineComponent({
         await getRegisterGoods();
         nextTick(() => {
           // 一页展示（必买）才显示团购提示弹窗
-          if (forms.registerType === 'MUST_BUY_GOODS' && browser().weixin) {
+          if (forms.registerType === 'MUST_BUY_GOODS' && browser().weixin && !forms.activeOverStatus) {
             state.tipBoxPop = true
+            document.body.style.overflow = 'hidden';
             tipCountdown(3)
           }
         })
@@ -1839,7 +1852,7 @@ export default defineComponent({
                 (forms.detailVip.giftFlag || state.currentIntrument?.instrumentId) &&
                 <div class={styles.extraTools}>
                   <div class={styles.exTitle}>
-                    <img src={giftExtraTitleIcon} />
+                    <img src={(state.currentIntrument?.instrumentId && forms.registerType === 'MUST_BUY_GOODS') ? giftExtraTitleIcon : giftExtraTitleIcon2} />
                   </div>
                   {/** 会员赠送 */}
                   {
@@ -1860,7 +1873,7 @@ export default defineComponent({
                   {
                     (state.currentIntrument?.instrumentId && forms.registerType === 'MUST_BUY_GOODS') && 
                     <div class={styles.extItem}>
-                      <img class={styles.toolImg} src={state.currentIntrument.img} />
+                      <img class={[styles.toolImg, styles.toolImgYq]} src={state.currentIntrument.img} />
                       <div class={styles.toolRight}>
                         <p>{state.currentIntrument.instrumentName}</p>
                         <div class={styles.trBottom}>
@@ -1871,7 +1884,10 @@ export default defineComponent({
                       <img class={styles.toolZsIcon} src={giftZsIcon} />
                     </div>                
                   }
-
+                  {
+                    (!state.currentIntrument?.instrumentId && forms.registerType === 'MUST_BUY_GOODS') && 
+                    <img src={selectZsTip} class={styles.extTip} />
+                  }
                 </div>
               }
             </div>            
@@ -1952,7 +1968,7 @@ export default defineComponent({
 
           {forms.joinType && (
             <MSticky position="bottom" ref={mstickyRef}>
-              <div class={styles.paymentContainer}>
+              <div class={[styles.paymentContainer, forms.registerType === 'MUST_BUY_GOODS' && styles.paymentContainer2]}>
                 <div class={styles.payemntPrice}>
                   {
                     forms.registerType === 'SELECT_BUY_GOODS' && 
@@ -2397,6 +2413,7 @@ export default defineComponent({
                 <span onClick={() => {
                   if (state.hideSecondsNum) {
                     state.tipBoxPop = false
+                    document.body.style.overflow = '';
                   }
                 }}>
                   我知道了