Merge branch 'iteration-orchestra-new' into online

src/student/music-group/layout/login.tsx

@@ -240,14 +240,15 @@ export default defineComponent({
     return (
       <div class={styles.login}>
         <div class={styles.loginTitle}>
-          {this.orchestraPath === '/preGoodsApply' ? (
+          {/* {this.orchestraPath === '/preGoodsApply' ? (
             '乐团报名'
           ) : (
             <>
               您好，
-              <br /> 欢迎使用管乐团学员端{' '}
+              <br /> 欢迎使用管乐团学员端
             </>
-          )}
+          )} */}
+          {this.orchestraInfo.loginTitle}
         </div>
         <CellGroup class={styles.margin34} border={false}>
           <Row style={{ marginBottom: '16px' }}>

src/student/music-group/pre-apply/component/payment.tsx

@@ -128,8 +128,11 @@ export default defineComponent({
           state.details = details
 
           // 默认选中所有的
-          if (!state.paymentOrderDetails.includes(item.goodsType) && item.goodsType == 'TEXTBOOK') {
-            state.check.push(item.goodsId)
+          if (!state.paymentOrderDetails.includes(item.goodsType)) {
+            // 是教材 显示
+            if (item.goodsType == 'TEXTBOOK' && item.textbookFlag) {
+              state.check.push(item.goodsId)
+            }
           }
         })
 
@@ -518,8 +521,8 @@ export default defineComponent({
             </>
           )}
 
-          {/* 判断是否已经购买教材 */}
-          {!state.paymentOrderDetails.includes('TEXTBOOK') && (
+          {/* 判断是否已经购买教材 是否显示教材 */}
+          {!state.paymentOrderDetails.includes('TEXTBOOK') && state.textBookInfo.textbookFlag && (
             <>
               {/* <div class={styles.applyTitle}>教材</div> */}
               <CellGroup

src/student/music-group/pre-goods-apply/index.tsx

@@ -251,13 +251,15 @@ export default defineComponent({
 
         // 教材
         const textBookInfo = state.textBookInfo
-        params.push({
-          goodsId: textBookInfo.goodsId,
-          goodsNum: 1,
-          goodsType: textBookInfo.goodsType,
-          paymentCashAmount: textBookInfo.currentPrice, // 现金支付金额
-          paymentCouponAmount: 0 // 优惠券金额
-        })
+        if (textBookInfo.textbookFlag) {
+          params.push({
+            goodsId: textBookInfo.goodsId,
+            goodsNum: 1,
+            goodsType: textBookInfo.goodsType,
+            paymentCashAmount: textBookInfo.currentPrice, // 现金支付金额
+            paymentCouponAmount: 0 // 优惠券金额
+          })
+        }
 
         // 商品
         const goodsInfo = state.goodsInfo
@@ -451,8 +453,10 @@ export default defineComponent({
       tempPrice.needPrice += parseFloat(state.vipYearInfo.currentPrice || 0)
       tempPrice.originalPrice += parseFloat(state.vipYearInfo.originalPrice || 0)
       // 教材
-      tempPrice.needPrice += parseFloat(state.textBookInfo.currentPrice || 0)
-      tempPrice.originalPrice += parseFloat(state.textBookInfo.originalPrice || 0)
+      if (state.textBookInfo.textbookFlag) {
+        tempPrice.needPrice += parseFloat(state.textBookInfo.currentPrice || 0)
+        tempPrice.originalPrice += parseFloat(state.textBookInfo.originalPrice || 0)
+      }
 
       // 检查乐器
       if (state.inspectStatus) {