fix: bug修复

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

@@ -903,7 +903,7 @@
     background-size: contain;
     height: 310px;
     width: 260px;
-    padding: 124px 22px 0;
+    padding: 124px 4px 0 22px;
     .tipTitle {
       width: 75px;
       display: block;
@@ -911,6 +911,7 @@
     }
     .tipBtn {
       position: relative;
+      margin-left: -10px;
       img {
         width: 190px;
         height: 62px;

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

@@ -842,6 +842,17 @@ export default defineComponent({
 
           forms.isRegister = 'update';
           changeTipStatus(true, false);
+
+          // 根据注册信息反显乐器信息
+          if (forms.registerType === 'MUST_BUY_GOODS' && (forms.schoolInstrumentSetType === 'CLASS' || forms.schoolInstrumentSetType === 'GRADE') ) {
+            const { currentClass, currentGradeNum } = forms.studentList[0]
+            if (forms.schoolInstrumentSetType === 'GRADE') {
+              state.currentIntrument = state.intrumentList.find((item: any) => item.gradeNum === currentGradeNum)
+            }
+            if (forms.schoolInstrumentSetType === 'CLASS') {
+              state.currentIntrument = state.intrumentList.find((item: any) => (item.gradeNum === currentGradeNum && item.classNum === currentClass) )
+            }
+          }
         } else {
           forms.isRegister = 'create';
           changeTipStatus(false, false);
@@ -1391,7 +1402,7 @@ export default defineComponent({
         await getRegisterGoods();
         nextTick(() => {
           // 一页展示（必买）才显示团购提示弹窗
-          if (forms.registerType === 'MUST_BUY_GOODS' && browser().weixin) {
+          if (forms.registerType === 'MUST_BUY_GOODS' && !browser().weixin) {
             state.tipBoxPop = true
             tipCountdown(3)
           }
@@ -1814,7 +1825,7 @@ export default defineComponent({
                       <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}>
-                          <span class={styles.tcPrice}>¥ 00.00</span>
+                          <span class={styles.tcPrice}>¥ 0.00</span>
                           <span class={styles.toPrice}>｜原价 <i>¥ {Number(forms.detailVip.giftOriginalPrice).toFixed(2)}</i></span>
                         </div>                  
                       </div>
@@ -1829,7 +1840,7 @@ export default defineComponent({
                       <div class={styles.toolRight}>
                         <p>{state.currentIntrument.instrumentName}</p>
                         <div class={styles.trBottom}>
-                          <span class={styles.tcPrice}>¥ 00.00</span>
+                          <span class={styles.tcPrice}>¥ 0.00</span>
                           <span class={styles.toPrice}>｜原价 <i>¥ {Number(state.currentIntrument.originalPrice).toFixed(2)}</i></span>
                         </div>                  
                       </div>
@@ -2043,7 +2054,10 @@ export default defineComponent({
                 // 更换年级班级后，判断是否需要更换赠送的乐器
                 if (forms.schoolInstrumentSetType === 'GRADE') {
                   state.currentIntrument = state.intrumentList.find((item: any) => (item.gradeNum === selectedOption.value))
-                }                
+                }         
+                if (forms.schoolInstrumentSetType === 'CLASS') {
+                  state.currentIntrument = null
+                }       
                 console.log('选择111',state.currentIntrument)
               }}
             />
@@ -2079,7 +2093,7 @@ export default defineComponent({
                 if (forms.schoolInstrumentSetType === 'CLASS') {
                   state.currentIntrument = state.intrumentList.find((item: any) => (item.gradeNum === studentInfo.extra.currentGradeNum && item.classNum === selectedOption.value) )
                 }                
-                // console.log('选择222',state.currentIntrument)
+                console.log('选择222',state.currentIntrument)
               }}
             />
           )}
@@ -2189,13 +2203,13 @@ export default defineComponent({
         </MPopup>
 
         {/* 是否在微信中打开 */}
-        <OWxTip
+        {/* <OWxTip
           show={forms.showTips}
           message={forms.showMessage}
           showButton={forms.showButton}
           buttonText="刷新"
           onConfirm={() => window.location.reload()}
-        />
+        /> */}
 
         <MMessageTip
           show={otherParams.showOtherSchool}
@@ -2353,7 +2367,11 @@ export default defineComponent({
               </ul>
               <div class={styles.tipBtn}>
                 <img src={tipBtnIcon} />
-                <span onClick={() => state.tipBoxPop = false}>
+                <span onClick={() => {
+                  if (state.hideSecondsNum) {
+                    state.tipBoxPop = false
+                  }
+                }}>
                   我知道了
                   {
                     !state.hideSecondsNum && <i>({state.descSecondsNum}s)</i>