Merge branch 'iteration-upload-works'

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.status === 0) {
             forms.showTips = true;
             forms.showMessage = '二维码已经失效，详情请咨询乐团老师';
             forms.showButton = false;
           }
+        } else {
+          forms.showTips = true;
         }
       } catch {}
     };

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

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