修改样式

src/student/music-group/pre-apply/order-detail.module.less

@@ -109,6 +109,7 @@
 
   .numFont {
     font-family: 'DINA';
+    font-size: 18px !important;
 
     .numPrefix {
       font-size: 14px !important;
@@ -125,7 +126,7 @@
     //   line-height: 22px;
     // }
     .goodsNum {
-      font-size: 18px;
+      font-size: 13px;
       color: #777777;
       line-height: 20px;
       flex-shrink: 0;
@@ -143,7 +144,7 @@
     }
 
     .goodsNums {
-      font-size: 18px;
+      font-size: 14px;
       font-weight: bold;
       color: #fc1a19;
     }

src/student/music-group/pre-apply/order-detail.tsx

@@ -378,8 +378,26 @@ export default defineComponent({
                       <div class={styles.goodsContent}>
                         <h2>
                           <span>{goods.goodsName}</span>
-                          <span class={styles.goodsNum}>
+                          {/* <span class={styles.goodsNum}>
                             {goods.goodsType === 'VIP' ? '6个月' : 'x 1'}
+                          </span> */}
+                          <span
+                            class={[
+                              styles.goodsNums,
+                              goods.paymentCashAmount > 0 ? styles.numFont : styles.free
+                            ]}
+                          >
+                            {goods.paymentCashAmount > 0 ? (
+                              <>
+                                <span class={styles.numPrefix}>¥ </span>
+                                {moneyFormat(goods.paymentCashAmount)}
+                              </>
+                            ) : state.orderInfo.orchestraRegisterType === 'GROUP_BUY' &&
+                              goods.goodsType === 'INSTRUMENTS' ? (
+                              '免费提供'
+                            ) : (
+                              '免费'
+                            )}
                           </span>
                         </h2>
                         <div class={styles.goodsPrice}>
@@ -402,23 +420,8 @@ export default defineComponent({
                             </span>
                           )}
 
-                          <span
-                            class={[
-                              styles.goodsNums,
-                              goods.paymentCashAmount > 0 ? styles.numFont : styles.free
-                            ]}
-                          >
-                            {goods.paymentCashAmount > 0 ? (
-                              <>
-                                <span class={styles.numPrefix}>¥ </span>
-                                {moneyFormat(goods.paymentCashAmount)}
-                              </>
-                            ) : state.orderInfo.orchestraRegisterType === 'GROUP_BUY' &&
-                              goods.goodsType === 'INSTRUMENTS' ? (
-                              '免费提供'
-                            ) : (
-                              '免费'
-                            )}
+                          <span class={styles.goodsNum}>
+                            {goods.goodsType === 'VIP' ? '6个月' : 'x 1'}
                           </span>
                         </div>
                         {/* <p class={styles.model}>{goods.description}</p> */}

src/student/music-group/pre-goods-apply/index.module.less

@@ -171,7 +171,7 @@
     border-radius: 6px;
     line-height: 1;
     padding: 5px 10px 3.5px;
-    font-weight: 600;
+    font-weight: 400;
     font-size: 16px;
 
     .radioItem {
@@ -313,7 +313,8 @@
 
 
 .groupBuy {
-  overflow: hidden;
+  // overflow: hidden;
+  padding-bottom: 24px;
 
   :global {
     .van-cell__value {
@@ -340,6 +341,7 @@
     padding-bottom: 4px;
 
     img {
+      margin-top: -1px;
       height: 18px;
       margin-left: 4px;
     }
@@ -442,9 +444,9 @@
   }
 
   .inspectCell {
-    margin: 0 12px 24px;
+    margin: 0 12px 0;
     padding: 8px 12px;
-    background: #FFF3EA;
+    background: #f4f4f4;
     border-radius: 6px;
     width: auto;
   }

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

@@ -234,13 +234,13 @@ export default defineComponent({
         calcPrice()
         const params: any = [] // 支付参数
 
-        // 学练工具
-        const vipYear = state.vipYearInfo
+        // 教材
+        const textBookInfo = state.textBookInfo
         params.push({
-          goodsId: vipYear.goodsId,
+          goodsId: textBookInfo.goodsId,
           goodsNum: 1,
-          goodsType: vipYear.goodsType,
-          paymentCashAmount: vipYear.currentPrice, // 现金支付金额
+          goodsType: textBookInfo.goodsType,
+          paymentCashAmount: textBookInfo.currentPrice, // 现金支付金额
           paymentCouponAmount: 0 // 优惠券金额
         })
 
@@ -254,16 +254,6 @@ export default defineComponent({
           paymentCouponAmount: 0 // 优惠券金额
         })
 
-        // 教材
-        const textBookInfo = state.textBookInfo
-        params.push({
-          goodsId: textBookInfo.goodsId,
-          goodsNum: 1,
-          goodsType: textBookInfo.goodsType,
-          paymentCashAmount: textBookInfo.currentPrice, // 现金支付金额
-          paymentCouponAmount: 0 // 优惠券金额
-        })
-
         // 检查
         if (state.inspectStatus) {
           const inspectInfo = state.inspectInfo
@@ -276,6 +266,16 @@ export default defineComponent({
           })
         }
 
+        // 学练工具
+        const vipYear = state.vipYearInfo
+        params.push({
+          goodsId: vipYear.goodsId,
+          goodsNum: 1,
+          goodsType: vipYear.goodsType,
+          paymentCashAmount: vipYear.currentPrice, // 现金支付金额
+          paymentCouponAmount: 0 // 优惠券金额
+        })
+
         // 创建订单
         const { data } = await request.post('/api-student/userPaymentOrder/executeOrder', {
           hideLoading: false,
@@ -888,6 +888,7 @@ export default defineComponent({
                   rules={[{ required: true, message: '请填写您计划配置的乐器品牌' }]}
                 />
                 <Field
+                  style="padding-top: 0;"
                   required
                   label="您计划配置的AI学练工具品牌"
                   labelAlign="top"