修改报名

src/views/student-register/index-apply.tsx

@@ -399,7 +399,16 @@ export default defineComponent({
           //   forms.showButton = false;
           //   return;
           // }
-          if (data.registerType !== 'BUG_GOODS' || data.schoolStatus === 0) {
+
+          /**
+           *  ['MUST_BUY_GOODS', 'SELECT_BUY_GOODS'].includes(
+                data.registerType
+              ))
+           */
+          if (
+            (route.query.rt && route.query.rt !== data.registerType) ||
+            data.schoolStatus === 0
+          ) {
             forms.showTips = true;
             forms.showMessage = '二维码已经失效，详情请咨询学校老师';
             forms.showButton = false;
@@ -654,10 +663,11 @@ export default defineComponent({
           data: {
             schoolId: forms.schoolId,
             clientType: 'STUDENT',
-            schoolVerify: true,
             ...extra,
-            giftVipDay:
-              forms.detailVip.membershipDays || 0 + forms.giftVipDay || 0,
+            giftVipFlag: forms.registerDetails.giftVipFlag || false,
+            giftVipDay: forms.giftVipDay || 0,
+            schoolVerify: true,
+            firstVipDay: forms.detailVip.membershipDays || 0,
             mobile: username,
             newRegUser: forms.isRegister === 'create' ? true : false
           }
@@ -1636,20 +1646,21 @@ export default defineComponent({
                 }
               }}>
               {{
-                icon: () => (
-                  <div class={styles.checkedGroup}>
-                    <i
-                      class={[
-                        styles.iconChecked,
-                        forms.joinType === 'digitalize' && styles.selected
-                      ]}></i>
-
-                    {/* {forms.tipStatus && <i class={styles.showBg}></i>} */}
-                    {forms.joinType === 'digitalize' && (
-                      <i class={styles.showBg}></i>
-                    )}
-                  </div>
-                ),
+                icon: () =>
+                  forms.registerType === 'SELECT_BUY_GOODS' && (
+                    <div class={styles.checkedGroup}>
+                      <i
+                        class={[
+                          styles.iconChecked,
+                          forms.joinType === 'digitalize' && styles.selected
+                        ]}></i>
+
+                      {/* {forms.tipStatus && <i class={styles.showBg}></i>} */}
+                      {forms.joinType === 'digitalize' && (
+                        <i class={styles.showBg}></i>
+                      )}
+                    </div>
+                  ),
                 title: () => (
                   <div class={styles.section}>
                     <Image

src/views/student-register/index.tsx

@@ -125,7 +125,7 @@ export default defineComponent({
       multi_user_limit: 1, // 限制注册学生数量
       // popupShow: false,
       registerDetails: {} as any,
-      details: [] as any[],
+      details: [] as any,
       // schoolType: '', // 学校类型
       gradeYear: '', // 学制
       schoolInstrumentSetType: null as any,
@@ -580,8 +580,7 @@ export default defineComponent({
             ...res,
             extra: JSON.stringify({
               ...extra,
-              giftVipDay:
-                forms.detailVip.membershipDays || 0 + forms.giftVipDay || 0,
+              giftVipDay: forms.giftVipDay || 0,
               schoolId: forms.schoolId
             })
           }
@@ -648,10 +647,11 @@ export default defineComponent({
           data: {
             schoolId: forms.schoolId,
             clientType: 'STUDENT',
-            schoolVerify: true,
             ...extra,
-            giftVipDay:
-              forms.detailVip.membershipDays || 0 + forms.giftVipDay || 0,
+            giftVipFlag: forms.registerDetails.giftVipFlag || false,
+            giftVipDay: forms.giftVipDay || 0,
+            schoolVerify: true,
+            firstVipDay: forms.detailVip.membershipDays || 0,
             mobile: username,
             newRegUser: forms.isRegister === 'create' ? true : false
           }