修改云教练摆放位置

1

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

@@ -278,22 +278,22 @@ export default defineComponent({
             calcPrice()
           }}
         >
-          {/* 判断是否已经购买乐器 */}
-          {!state.paymentOrderDetails.includes('INSTRUMENTS') && (
+          {/* 判断是否买了乐器学习系统 */}
+          {!state.paymentOrderDetails.includes('VIP') && (
             <>
-              {/* <div class={styles.applyTitle}>乐器</div> */}
+              {/* <div class={styles.applyTitle}>乐团学习系统</div> */}
               <CellGroup
                 inset
                 class={[styles.mlr13, styles.sectionCell]}
-                onClick={() => onSelect(state.goodsInfo.goodsId)}
+                onClick={() => onSelect(state.vipInfo.goodsId)}
               >
                 <Cell border={false}>
                   {{
                     icon: () => (
                       <Checkbox
-                        name={state.goodsInfo.goodsId}
+                        name={state.vipInfo.goodsId}
                         class={styles.checkbox}
-                        ref={(el: any) => (state.checkboxRefs[state.goodsInfo.goodsId] = el)}
+                        ref={(el: any) => (state.checkboxRefs[state.vipInfo.goodsId] = el)}
                         onClick={(e: Event) => {
                           e.stopPropagation()
                         }}
@@ -311,45 +311,37 @@ export default defineComponent({
                       <div class={styles.section}>
                         <Image
                           class={styles.img}
-                          src={state.goodsInfo.goodsUrl}
+                          src={state.vipInfo.goodsUrl}
                           onClick={(e: any) => {
                             e.stopPropagation()
-                            state.selectGoodsId = state.goodsInfo.goodsId
-                            state.currentPrice = state.goodsInfo.currentPrice
-                            state.selectGoodsInfo = {
-                              showFree: true,
-                              originalPrice: state.repaireInfo.originalPrice
-                            }
-                            state.goodsStatus = true
+                            state.memberBaoStatus = true
                           }}
                         />
                         <div class={styles.sectionContent}>
                           <h2
                             onClick={(e: any) => {
                               e.stopPropagation()
-                              state.selectGoodsId = state.goodsInfo.goodsId
-                              state.currentPrice = state.goodsInfo.currentPrice
-                              state.goodsStatus = true
+                              state.memberBaoStatus = true
                             }}
                           >
-                            {state.goodsInfo.goodsName}
+                            {state.vipInfo.goodsName}
                           </h2>
                           <Tag
                             color="linear-gradient(135deg, #FF8C4A 0%, #FF531C 100%)"
                             textColor="#fff"
                             class={styles.brandName}
                           >
-                            {state.goodsInfo.brandName}
+                            6个月
                           </Tag>
                           <p class={[styles.model, 'van-multi-ellipsis--l2']}>
-                            {state.goodsInfo.description}
+                            {state.vipInfo.description}
                           </p>
                         </div>
                       </div>
                     )
                   }}
                 </Cell>
-                <Cell border={false}>
+                <Cell>
                   {{
                     title: () => (
                       <div class={styles.extra}>
@@ -357,14 +349,14 @@ export default defineComponent({
                           <p class={styles.price}>
                             团购价：
                             <span class={styles.numFont}>
-                              <span class={styles.numPrefix}>¥ </span>
-                              {moneyFormat(state.goodsInfo.currentPrice)}
+                              <span class={styles.numPrefix}>¥</span>
+                              {moneyFormat(state.vipInfo.currentPrice)}
                             </span>
                           </p>
                           <p class={styles.originPrice}>
                             原价：
                             <del class={styles.numFont}>
-                              ¥ {moneyFormat(state.goodsInfo.originalPrice)}
+                              ¥ {moneyFormat(state.vipInfo.originalPrice)}
                             </del>
                           </p>
                         </div>
@@ -372,35 +364,25 @@ export default defineComponent({
                     )
                   }}
                 </Cell>
-                <Cell center class={styles.gives}>
-                  {{
-                    title: () => (
-                      <div class={styles.sectionTips}>
-                        <Image src={iconGives} class={styles.iconGives} />
-                        赠价值{state.repaireInfo.originalPrice}元乐器维保服务一年
-                      </div>
-                    )
-                  }}
-                </Cell>
               </CellGroup>
             </>
           )}
-
-          {!state.paymentOrderDetails.includes('VIP') && (
+          {/* 判断是否已经购买乐器 */}
+          {!state.paymentOrderDetails.includes('INSTRUMENTS') && (
             <>
-              {/* <div class={styles.applyTitle}>乐团学习系统</div> */}
+              {/* <div class={styles.applyTitle}>乐器</div> */}
               <CellGroup
                 inset
                 class={[styles.mlr13, styles.sectionCell]}
-                onClick={() => onSelect(state.vipInfo.goodsId)}
+                onClick={() => onSelect(state.goodsInfo.goodsId)}
               >
                 <Cell border={false}>
                   {{
                     icon: () => (
                       <Checkbox
-                        name={state.vipInfo.goodsId}
+                        name={state.goodsInfo.goodsId}
                         class={styles.checkbox}
-                        ref={(el: any) => (state.checkboxRefs[state.vipInfo.goodsId] = el)}
+                        ref={(el: any) => (state.checkboxRefs[state.goodsInfo.goodsId] = el)}
                         onClick={(e: Event) => {
                           e.stopPropagation()
                         }}
@@ -418,37 +400,45 @@ export default defineComponent({
                       <div class={styles.section}>
                         <Image
                           class={styles.img}
-                          src={state.vipInfo.goodsUrl}
+                          src={state.goodsInfo.goodsUrl}
                           onClick={(e: any) => {
                             e.stopPropagation()
-                            state.memberBaoStatus = true
+                            state.selectGoodsId = state.goodsInfo.goodsId
+                            state.currentPrice = state.goodsInfo.currentPrice
+                            state.selectGoodsInfo = {
+                              showFree: true,
+                              originalPrice: state.repaireInfo.originalPrice
+                            }
+                            state.goodsStatus = true
                           }}
                         />
                         <div class={styles.sectionContent}>
                           <h2
                             onClick={(e: any) => {
                               e.stopPropagation()
-                              state.memberBaoStatus = true
+                              state.selectGoodsId = state.goodsInfo.goodsId
+                              state.currentPrice = state.goodsInfo.currentPrice
+                              state.goodsStatus = true
                             }}
                           >
-                            {state.vipInfo.goodsName}
+                            {state.goodsInfo.goodsName}
                           </h2>
                           <Tag
                             color="linear-gradient(135deg, #FF8C4A 0%, #FF531C 100%)"
                             textColor="#fff"
                             class={styles.brandName}
                           >
-                            6个月
+                            {state.goodsInfo.brandName}
                           </Tag>
                           <p class={[styles.model, 'van-multi-ellipsis--l2']}>
-                            {state.vipInfo.description}
+                            {state.goodsInfo.description}
                           </p>
                         </div>
                       </div>
                     )
                   }}
                 </Cell>
-                <Cell>
+                <Cell border={false}>
                   {{
                     title: () => (
                       <div class={styles.extra}>
@@ -456,14 +446,14 @@ export default defineComponent({
                           <p class={styles.price}>
                             团购价：
                             <span class={styles.numFont}>
-                              <span class={styles.numPrefix}>¥</span>
-                              {moneyFormat(state.vipInfo.currentPrice)}
+                              <span class={styles.numPrefix}>¥ </span>
+                              {moneyFormat(state.goodsInfo.currentPrice)}
                             </span>
                           </p>
                           <p class={styles.originPrice}>
                             原价：
                             <del class={styles.numFont}>
-                              ¥ {moneyFormat(state.vipInfo.originalPrice)}
+                              ¥ {moneyFormat(state.goodsInfo.originalPrice)}
                             </del>
                           </p>
                         </div>
@@ -471,6 +461,16 @@ export default defineComponent({
                     )
                   }}
                 </Cell>
+                {/* <Cell center class={styles.gives}>
+                  {{
+                    title: () => (
+                      <div class={styles.sectionTips}>
+                        <Image src={iconGives} class={styles.iconGives} />
+                        赠价值{state.repaireInfo.originalPrice}元乐器维保服务一年
+                      </div>
+                    )
+                  }}
+                </Cell> */}
               </CellGroup>
             </>
           )}