lex 1 year ago
parent
commit
fc4f265ce4

BIN
src/common/images/wx-no-top.png


+ 6 - 5
src/components/m-wx-tip/index.module.less

@@ -1,19 +1,20 @@
 .wxPopupDialog {
   // position: relative;
   overflow: initial;
+  border-radius: 20px !important;
 
   // margin-top: -160px;
   &::before {
     position: absolute;
     content: ' ';
-    top: -23px;
+    top: -22px;
     left: 50%;
-    margin-left: -45px;
+    margin-left: -51px;
     display: inline-block;
     background: url('../../common/images/wx-no-top.png') no-repeat top center;
     background-size: contain;
-    width: 89px;
-    height: 57px;
+    width: 103px;
+    height: 56px;
   }
 }
 
@@ -38,7 +39,7 @@
     text-align: center;
     font-size: 15px;
     color: #666;
-    line-height: 21px;
+    line-height: 23px;
   }
 
   .button {

+ 12 - 5
src/views/student-register/index.tsx

@@ -212,6 +212,7 @@ export default defineComponent({
       time: forms.activeOverTime,
       onFinish() {
         forms.activeOverStatus = true;
+        console.log(forms.submitLoading, 'forms.submitLoading');
         if (forms.submitLoading) return;
         applyOver();
       }
@@ -221,6 +222,7 @@ export default defineComponent({
       forms.showTips = true;
       forms.showMessage = '团购时间已截止,感谢您的参与';
       forms.showButton = false;
+      forms.intervalFnRef?.pause();
     };
 
     const onCodeSend = () => {
@@ -263,7 +265,7 @@ export default defineComponent({
         studentRegisterStore.setVip(data.details || []);
         forms.details = deepClone(data.details || []);
 
-        forms.registerExpireTime = data.registerExpireTime; // '2024-03-26 21:10:52'; //
+        forms.registerExpireTime = '2024-03-27 17:33:52'; //data.registerExpireTime; //
         if (forms.registerExpireTime) {
           if (dayjs(new Date()).isBefore(forms.registerExpireTime)) {
             // 活动没有结束
@@ -274,6 +276,8 @@ export default defineComponent({
             );
             overCountDown.reset(forms.activeOverTime);
             overCountDown.start();
+
+            pagePointInit();
           } else {
             applyOver();
             forms.activeOverStatus = true;
@@ -474,9 +478,10 @@ export default defineComponent({
 
           await onRegisterSubmit();
         }
+      } catch {
       } finally {
+        forms.submitLoading = false;
       }
-      forms.submitLoading = false;
     };
 
     // 登记成功之后购买
@@ -889,9 +894,8 @@ export default defineComponent({
       }
     };
 
-    onMounted(async () => {
+    const pagePointInit = async () => {
       try {
-        getRegisterGoods();
         // 判断是否获取微信code码
         if (!forms.code) return;
         const { data } = await request.post(
@@ -918,6 +922,10 @@ export default defineComponent({
           await updateStat();
         }, 5000);
       } catch {}
+    };
+
+    onMounted(async () => {
+      await getRegisterGoods();
     });
 
     onUnmounted(() => {
@@ -1426,7 +1434,6 @@ export default defineComponent({
             const paymentConfig = forms.dialogConfig.paymentConfig;
             state.config = paymentConfig?.paymentConfig;
             state.orderNo = paymentConfig?.orderNo;
-
             await lastSubmit();
           }}
           onCancel={(val: any) => {