Merge branch 'iteration-upload-works' into online

src/views/student-register/index.tsx

@@ -123,11 +123,13 @@ export default defineComponent({
         forms.gradeYear = data.gradeYear;
         forms.registerType = data.registerType;
         if (browser().weixin) {
-          if (data.registerType !== 'BUG_GOODS') {
+          if (data.registerType !== 'BUG_GOODS' || data.schoolStatus === 0) {
             forms.showTips = true;
-            forms.showMessage = '二维码已经失效，详情请咨询乐团老师';
+            forms.showMessage = '二维码已经失效，详情请咨询学校老师';
             forms.showButton = false;
           }
+        } else {
+          forms.showTips = true;
         }
       } catch {}
     };
@@ -241,7 +243,7 @@ export default defineComponent({
 
         if (result.code === 5436) {
           forms.showTips = true;
-          forms.showMessage = '二维码已经失效，详情请咨询乐团老师';
+          forms.showMessage = '二维码已经失效，详情请咨询学校老师';
           forms.showButton = false;
           forms.popupRegister = false;
         } else if (result.code === 5435) {
@@ -567,7 +569,7 @@ export default defineComponent({
             onError={(val: any) => {
               if (val.code === 5436) {
                 forms.showTips = true;
-                forms.showMessage = '二维码已经失效，详情请咨询乐团老师';
+                forms.showMessage = '二维码已经失效，详情请咨询学校老师';
                 forms.showButton = false;
                 forms.popupRegister = false;
               } else if (val.code === 5435) {

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

@@ -157,7 +157,7 @@ export default defineComponent({
         });
         if (result.code === 5436) {
           forms.showTips = true;
-          forms.showMessage = '二维码已经失效，详情请咨询乐团老师';
+          forms.showMessage = '二维码已经失效，详情请咨询学校老师';
           forms.showButton = false;
         } else if (result.code === 5435) {
           forms.showTips = true;
@@ -209,12 +209,15 @@ export default defineComponent({
         forms.gradeYear = data.gradeYear;
         studentInfo.extra.giftVipDay = data.giftVipDay;
         studentInfo.extra.registerType = data.registerType;
+
         if (browser().weixin) {
-          if (data.registerType !== 'GIFT_VIP_DAY') {
+          if (data.registerType !== 'GIFT_VIP_DAY' || data.status === 0) {
             forms.showTips = true;
-            forms.showMessage = '二维码已经失效，详情请咨询乐团老师';
+            forms.showMessage = '二维码已经失效，详情请咨询学校老师';
             forms.showButton = false;
           }
+        } else {
+          forms.showTips = true;
         }
       } catch {}
     };