Browse Source

fix: 年级乐器回显bug修复

TIANYONG 4 months ago
parent
commit
d501619ebf
1 changed files with 9 additions and 8 deletions
  1. 9 8
      src/views/student-register/index-apply.tsx

+ 9 - 8
src/views/student-register/index-apply.tsx

@@ -1387,7 +1387,8 @@ export default defineComponent({
         await getRegisterGoods();
         nextTick(() => {
           // 一页展示(必买)才显示团购提示弹窗
-          if (forms.registerType === 'MUST_BUY_GOODS' && browser().weixin) {
+          //if (forms.registerType === 'MUST_BUY_GOODS' && browser().weixin) {
+            if (forms.registerType === 'MUST_BUY_GOODS' ) {
             state.tipBoxPop = true
             tipCountdown(3)
           }
@@ -2035,9 +2036,9 @@ export default defineComponent({
                 }
                 // 更换年级班级后,判断是否需要更换赠送的乐器
                 if (forms.schoolInstrumentSetType === 'GRADE') {
-                  state.currentIntrument = state.intrumentList.find((item: any) => (item.gradeNum === studentInfo.extra.currentGradeNum && item.classNum === selectedOption.value) )
-                }
-                // console.log('选择111',state.currentIntrument)
+                  state.currentIntrument = state.intrumentList.find((item: any) => (item.gradeNum === selectedOption.value))
+                }                
+                console.log('选择111',state.currentIntrument)
               }}
             />
           )}
@@ -2070,8 +2071,8 @@ export default defineComponent({
                 }
                 // 更换年级班级后,判断是否需要更换赠送的乐器
                 if (forms.schoolInstrumentSetType === 'CLASS') {
-                  state.currentIntrument = state.intrumentList.find((item: any) => (item.gradeNum === selectedOption.value))
-                }
+                  state.currentIntrument = state.intrumentList.find((item: any) => (item.gradeNum === studentInfo.extra.currentGradeNum && item.classNum === selectedOption.value) )
+                }                
                 // console.log('选择222',state.currentIntrument)
               }}
             />
@@ -2182,13 +2183,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}