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

src/views/member-center/index.tsx

@@ -302,7 +302,7 @@ export default defineComponent({
             ]}>
             <p class={[styles.title]}>
               乐器AI学练工具
-              <span>12个月</span>
+              <span>1年</span>
             </p>
             <div class={styles.priceGroup}>
               <p class={styles.price}>

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

@@ -13,7 +13,7 @@
     background-size: contain;
   }
   .studentRegisterContainer2 {
-    padding-top: 142px;
+    padding-top: 40%;
     background: url('./images/new/banner-bg5.png') no-repeat top center;
     background-size: contain;
   }
@@ -952,13 +952,20 @@
         }
       }
     }
+    &.tipBox2 {
+      background: url('./images/tip-box-icon2.png') no-repeat center;
+      background-size: contain;
+      height: 286px;
+      width: 260px;
+      padding: 124px 4px 0 22px;
+    }
   }
 }
 
 .giftBox {
   position: relative;
   margin: 1px 14px 16px;
-  background: linear-gradient(180deg, #DBF6FD 0%, #FFFFFF 10%);
+  background: linear-gradient(180deg, #DBF6FD 0%, #FFFFFF 16%);
   border-radius: 16px;
   border: 2px solid #FFFFFF;
   padding: 12px 14px 14px;
@@ -985,6 +992,7 @@
       height: 80px;
       justify-content: space-between;
       overflow: hidden;
+      padding: 6px 0 4px;
       >p {
         font-size: 16px;
         color: #000000;
@@ -1039,6 +1047,7 @@
       display: flex;
       align-items: center;
       //padding: 10px 10px 10px;
+      padding: 7px 0 4px;
       margin: 10px;
       position: relative;
       overflow: hidden;

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

@@ -1359,6 +1359,28 @@ export default defineComponent({
       }, 1000);  // 每秒执行一次
     }
 
+    // 切换学生，匹配赠送的乐器信息
+    const matchSwitchInstrument = (val: any) => {
+      if (forms.registerType === 'MUST_BUY_GOODS') {
+        // 学校
+        // if (forms.schoolInstrumentSetType === 'SCHOOL') {
+        //   state.currentIntrument = state.intrumentList.find((item: any) => item.schoolId === val.schoolId)
+        // }
+        // if (!state.intrumentList.find((item: any) => item.schoolId === val.schoolId)) {
+        //   state.currentIntrument = null;
+        //   return
+        // }
+        // 年级
+        if (forms.schoolInstrumentSetType === 'GRADE') {
+          state.currentIntrument = state.intrumentList.find((item: any) => item.gradeNum === val.currentGradeNum)
+        }
+        // 班级
+        if (forms.schoolInstrumentSetType === 'CLASS') {
+          state.currentIntrument = state.intrumentList.find((item: any) => (item.classNum === val.currentClass && item.gradeNum === val.currentGradeNum) )
+        }
+      }
+    }
+
     onMounted(async () => {
       try {
         // 获取支付类型
@@ -1823,7 +1845,7 @@ export default defineComponent({
                   {
                     forms.detailVip.giftFlag && 
                     <div class={styles.extItem}>
-                      <img class={styles.toolImg} src={giftCard2Icon} />
+                      <img class={styles.toolImg} src={forms.detailVip.giftGoodsUrl} />
                       <div class={styles.toolRight}>
                         <p>乐器AI学练工具{forms.detailVip.giftPeriod === 'YEAR' ? convertToChineseNumber(forms.detailVip.giftVipDay) : forms.detailVip.giftVipDay}{forms.detailVip.zsUnit}卡</p>
                         <div class={styles.trBottom}>
@@ -2279,6 +2301,7 @@ export default defineComponent({
             list={forms.studentList}
             onClose={() => (forms.showSelectStudent = false)}
             onConfirm={(val: any) => {
+              console.log('测试111')
               if (val.userId) {
                 forms.studentItem = val;
                 const firstStudent = val;
@@ -2341,6 +2364,8 @@ export default defineComponent({
                   forms.showSelectStudent = false;
                 }
               }
+              // 切换学生，需要更换显示的乐器
+              matchSwitchInstrument(val)
             }}
           />
         </Popup>
@@ -2348,7 +2373,7 @@ export default defineComponent({
         {
           state.tipBoxPop && 
           <div class={styles.tipBoxPop}>
-            <div class={styles.tipBox}>
+            <div class={[styles.tipBox, !state.giftDesc && styles.tipBox2]}>
               <img class={styles.tipTitle} src={tipTitleIcon} />
               <ul>
                 <li class={styles.tipItem}>