Browse Source

fix: bug修复

TIANYONG 4 months ago
parent
commit
ca12b29301

+ 6 - 0
src/views/student-register/index-apply.module.less

@@ -429,6 +429,9 @@
       font-size: 15px;
       font-size: 15px;
       color: #131415;
       color: #131415;
     }
     }
+    .van-cell__right-icon {
+      color: #d8d8d8 !important;
+    }
   }
   }
 
 
   .codeText {
   .codeText {
@@ -925,6 +928,9 @@
         font-size: 18px;
         font-size: 18px;
         color: #fff;
         color: #fff;
         font-weight: 500;
         font-weight: 500;
+        i {
+          font-style: normal;
+        }
       }
       }
     }
     }
     .tipItem {
     .tipItem {

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

@@ -129,6 +129,9 @@ export default defineComponent({
     const route = useRoute();
     const route = useRoute();
     const studentRegisterStore = useStudentRegisterStore();
     const studentRegisterStore = useStudentRegisterStore();
     const router = useRouter();
     const router = useRouter();
+    if (route.query.rt === 'MUST_BUY_GOODS') {
+      document.title = '音乐(器乐)数字AI团购通道'
+    }
     // 初始化学校编号
     // 初始化学校编号
     studentRegisterStore.setShoolId(route.query.sId as any);
     studentRegisterStore.setShoolId(route.query.sId as any);
     const countDownRef = ref();
     const countDownRef = ref();
@@ -230,6 +233,7 @@ export default defineComponent({
       currentIntrument: null as any, // 当前匹配上的乐器
       currentIntrument: null as any, // 当前匹配上的乐器
       giftDesc: '' as any, // 团购政策,赠送会员的提示信息
       giftDesc: '' as any, // 团购政策,赠送会员的提示信息
       descSecondsNum: 3, // 倒计时
       descSecondsNum: 3, // 倒计时
+      hideSecondsNum: false, // 隐藏倒计时文字
     });
     });
 
 
     /*
     /*
@@ -1337,7 +1341,7 @@ export default defineComponent({
         state.descSecondsNum = state.descSecondsNum > 1 ? state.descSecondsNum - 1 : 1;
         state.descSecondsNum = state.descSecondsNum > 1 ? state.descSecondsNum - 1 : 1;
         if (remainingTime < 1) {
         if (remainingTime < 1) {
           clearInterval(interval);  // 清除定时器
           clearInterval(interval);  // 清除定时器
-          state.tipBoxPop = false
+          state.hideSecondsNum = true
         }
         }
       }, 1000);  // 每秒执行一次
       }, 1000);  // 每秒执行一次
     }
     }
@@ -1640,7 +1644,7 @@ export default defineComponent({
                   forms.classStatus = true;
                   forms.classStatus = true;
                 }}
                 }}
               />
               />
-              {forms.giftVipDay > 0 ? (
+              {(forms.giftVipDay > 0 && forms.registerDetails.giftVipFlag) ? (
                 <div class={styles.memberNumer}>
                 <div class={styles.memberNumer}>
                   <img src={iconGift} class={styles.iconGift} />
                   <img src={iconGift} class={styles.iconGift} />
 
 
@@ -1789,7 +1793,7 @@ export default defineComponent({
                   <p>乐器AI学练工具一年卡</p>
                   <p>乐器AI学练工具一年卡</p>
                   <div class={styles.trDesc}>7天无理由退款</div>
                   <div class={styles.trDesc}>7天无理由退款</div>
                   <div class={styles.trBottom}>
                   <div class={styles.trBottom}>
-                    <span class={styles.tcPrice}>¥ {forms.detailVip.currentPrice}</span>
+                    <span class={styles.tcPrice}>¥ {Number(forms.detailVip.currentPrice).toFixed(2)}</span>
                     <span class={styles.toPrice}>|原价 <i>¥ {Number(forms.detailVip.originalPrice).toFixed(2)}</i></span>
                     <span class={styles.toPrice}>|原价 <i>¥ {Number(forms.detailVip.originalPrice).toFixed(2)}</i></span>
                   </div>
                   </div>
                 </div>
                 </div>
@@ -1821,7 +1825,7 @@ export default defineComponent({
                   {
                   {
                     (state.currentIntrument?.instrumentId && forms.registerType === 'MUST_BUY_GOODS') && 
                     (state.currentIntrument?.instrumentId && forms.registerType === 'MUST_BUY_GOODS') && 
                     <div class={styles.extItem}>
                     <div class={styles.extItem}>
-                      <img class={styles.toolImg} src={giftCard2Icon} />
+                      <img class={styles.toolImg} src={state.currentIntrument.img} />
                       <div class={styles.toolRight}>
                       <div class={styles.toolRight}>
                         <p>{state.currentIntrument.instrumentName}</p>
                         <p>{state.currentIntrument.instrumentName}</p>
                         <div class={styles.trBottom}>
                         <div class={styles.trBottom}>
@@ -1923,9 +1927,12 @@ export default defineComponent({
                     <span class={styles.needPrice}>
                     <span class={styles.needPrice}>
                       <i style="font-style: normal">¥ </i>
                       <i style="font-style: normal">¥ </i>
                       <span>{moneyFormat(calcPrice.value.amount)}</span>
                       <span>{moneyFormat(calcPrice.value.amount)}</span>
-                      <i class={styles.unit} style="font-style: normal">
-                        /年
-                      </i>
+                      {
+                        forms.registerType === 'SELECT_BUY_GOODS' && 
+                        <i class={styles.unit} style="font-style: normal">
+                          /年
+                        </i>                        
+                      }
                     </span>
                     </span>
                     {calcPrice.value.originAmount > calcPrice.value.amount &&
                     {calcPrice.value.originAmount > calcPrice.value.amount &&
                     forms.joinType === 'digitalize' ? (
                     forms.joinType === 'digitalize' ? (
@@ -2346,7 +2353,12 @@ export default defineComponent({
               </ul>
               </ul>
               <div class={styles.tipBtn}>
               <div class={styles.tipBtn}>
                 <img src={tipBtnIcon} />
                 <img src={tipBtnIcon} />
-                <span>我知道了({state.descSecondsNum}s)</span>
+                <span onClick={() => state.tipBoxPop = false}>
+                  我知道了
+                  {
+                    !state.hideSecondsNum && <i>({state.descSecondsNum}s)</i>
+                  }
+                </span>
               </div>
               </div>
             </div>
             </div>
           </div>          
           </div>          

+ 1 - 1
src/views/student-register/index.tsx

@@ -1890,7 +1890,7 @@ export default defineComponent({
                   forms.classStatus = true;
                   forms.classStatus = true;
                 }}
                 }}
               />
               />
-              {forms.giftVipDay > 0 ? (
+              {(forms.giftVipDay > 0 && forms.registerDetails.giftVipFlag) ? (
                 <div class={styles.memberNumer}>
                 <div class={styles.memberNumer}>
                   <img src={iconGift} class={styles.iconGift} />
                   <img src={iconGift} class={styles.iconGift} />