|  | @@ -41,7 +41,7 @@ for (let i = 1; i <= 40; i++) {
 | 
	
		
			
				|  |  |  export default defineComponent({
 | 
	
		
			
				|  |  |    name: 'register-modal',
 | 
	
		
			
				|  |  |    emits: ['close', 'submit'],
 | 
	
		
			
				|  |  | -  setup(props, { emit }) {
 | 
	
		
			
				|  |  | +  setup() {
 | 
	
		
			
				|  |  |      const route = useRoute();
 | 
	
		
			
				|  |  |      const router = useRouter();
 | 
	
		
			
				|  |  |      const studentRegisterStore = useStudentRegisterStore();
 | 
	
	
		
			
				|  | @@ -123,6 +123,7 @@ export default defineComponent({
 | 
	
		
			
				|  |  |      });
 | 
	
		
			
				|  |  |      const studentInfo = reactive({
 | 
	
		
			
				|  |  |        autoRegister: true,
 | 
	
		
			
				|  |  | +      multiUser: true, // 是否为多用户
 | 
	
		
			
				|  |  |        client_id: 'cooleshow-student',
 | 
	
		
			
				|  |  |        client_secret: 'cooleshow-student',
 | 
	
		
			
				|  |  |        extra: {
 | 
	
	
		
			
				|  | @@ -167,18 +168,27 @@ export default defineComponent({
 | 
	
		
			
				|  |  |        try {
 | 
	
		
			
				|  |  |          if (checkForm() || checkSubmit()) return;
 | 
	
		
			
				|  |  |          forms.loading = true;
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | -        await request.get('/edu-app/open/student/schoolQuery', {
 | 
	
		
			
				|  |  | -          params: {
 | 
	
		
			
				|  |  | -            schoolId: forms.schoolId,
 | 
	
		
			
				|  |  | -            mobile: studentInfo.username
 | 
	
		
			
				|  |  | -          }
 | 
	
		
			
				|  |  | -        });
 | 
	
		
			
				|  |  | -        const { extra, ...res } = studentInfo;
 | 
	
		
			
				|  |  | +        const { extra, loginType, autoRegister, password, multiUser, ...res } =
 | 
	
		
			
				|  |  | +          studentInfo;
 | 
	
		
			
				|  |  | +        let tLoginType = loginType,
 | 
	
		
			
				|  |  | +          tAutoRegister = autoRegister,
 | 
	
		
			
				|  |  | +          tPassword = password,
 | 
	
		
			
				|  |  | +          tMultiUser = multiUser;
 | 
	
		
			
				|  |  | +        if (forms.isRegister === 'update') {
 | 
	
		
			
				|  |  | +          tLoginType = 'TOKEN';
 | 
	
		
			
				|  |  | +          tAutoRegister = false;
 | 
	
		
			
				|  |  | +          tPassword = forms.studentItem.token;
 | 
	
		
			
				|  |  | +          tMultiUser = false;
 | 
	
		
			
				|  |  | +        }
 | 
	
		
			
				|  |  | +        // const { extra, ...res } = studentInfo;
 | 
	
		
			
				|  |  |          const result = await request.post('/edu-app/userlogin', {
 | 
	
		
			
				|  |  |            hideLoading: false,
 | 
	
		
			
				|  |  |            requestType: 'form',
 | 
	
		
			
				|  |  |            data: {
 | 
	
		
			
				|  |  | +            loginType: tLoginType,
 | 
	
		
			
				|  |  | +            autoRegister: tAutoRegister,
 | 
	
		
			
				|  |  | +            password: tPassword,
 | 
	
		
			
				|  |  | +            multiUser: tMultiUser,
 | 
	
		
			
				|  |  |              ...res,
 | 
	
		
			
				|  |  |              extra: JSON.stringify({
 | 
	
		
			
				|  |  |                ...extra,
 | 
	
	
		
			
				|  | @@ -197,8 +207,14 @@ export default defineComponent({
 | 
	
		
			
				|  |  |          } else {
 | 
	
		
			
				|  |  |            setTimeout(() => {
 | 
	
		
			
				|  |  |              showToast('报名成功');
 | 
	
		
			
				|  |  | -            router.push('/download');
 | 
	
		
			
				|  |  | +            // router.push('/download');
 | 
	
		
			
				|  |  |            }, 100);
 | 
	
		
			
				|  |  | +          setTimeout(() => {
 | 
	
		
			
				|  |  | +            if (browser().weixin) {
 | 
	
		
			
				|  |  | +              // 关闭微信
 | 
	
		
			
				|  |  | +              (window as any).WeixinJSBridge.call('closeWindow');
 | 
	
		
			
				|  |  | +            }
 | 
	
		
			
				|  |  | +          }, 1000);
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  |        } catch {
 | 
	
		
			
				|  |  |          // 重置信息 - 如果是新建则不提示
 | 
	
	
		
			
				|  | @@ -248,12 +264,8 @@ export default defineComponent({
 | 
	
		
			
				|  |  |            const tempGrade: any = gradeList.value[0] || [];
 | 
	
		
			
				|  |  |            tempGrade?.forEach((i: any) => {
 | 
	
		
			
				|  |  |              if (i.value === firstStudent.currentGradeNum) {
 | 
	
		
			
				|  |  | -              // forms.instrumentCode = i.instrumentCode;
 | 
	
		
			
				|  |  |                forms.gradeNumText = i.text;
 | 
	
		
			
				|  |  |                studentInfo.extra.currentGradeNum = firstStudent.currentGradeNum;
 | 
	
		
			
				|  |  | -              // if (forms.schoolInstrumentSetType === 'CLASS') {
 | 
	
		
			
				|  |  | -              //   forms.classList = i.classList;
 | 
	
		
			
				|  |  | -              // }
 | 
	
		
			
				|  |  |              }
 | 
	
		
			
				|  |  |            });
 | 
	
		
			
				|  |  |            classList.forEach((i: any) => {
 |