Merge branch 'preOnline'

src/components/timerMeter/components/countdown.tsx

@@ -146,7 +146,7 @@ export default defineComponent({
     };
 
     const suspendNum = () => {
-      setTimeout(()=>{
+      setTimeout(() => {
         isPlaying.value = false;
         soundVIdeo.currentTime = 0;
         soundVIdeo.pause();
@@ -154,8 +154,7 @@ export default defineComponent({
           clearInterval(timer.value);
           timer.value = null;
         }
-      },600)
-
+      }, 600);
     };
     const onReset = () => {
       suspendNum();

src/views/studentList/index.tsx

@@ -343,6 +343,7 @@ export default defineComponent({
         {state.addStudentVisible ? (
           <div v-model:show={state.addStudentVisible} class="n-modal-mask">
             <AddStudentModel
+              activeRow={state.activeRow}
               onClose={() => {
                 state.addStudentVisible = false;
               }}></AddStudentModel>

src/views/studentList/modals/addStudentModel.tsx

@@ -45,10 +45,19 @@ export default defineComponent({
     const message = useMessage();
     const userStore = useUserStore();
     const foemsRef = ref();
+    // const url = ref(
+    //   vaildUrl() +
+    //     `/classroom-app/#/student-register?sId=${userStore.getUserInfo.schoolInfos[0].id}`
+    // );
+
     const url = ref(
-      vaildUrl() +
-        `/classroom-app/#/student-register?sId=${userStore.getUserInfo.schoolInfos[0].id}`
+      vaildUrl() + `/classroom-app/#/student-register?sId=${props.activeRow.id}`
     );
+    if (props.activeRow.registerType != 'BUG_GOODS') {
+      url.value =
+        vaildUrl() +
+        `/classroom-app/#/register-member?sId=${props.activeRow.id}`;
+    }
     const imgs = reactive({
       saveLoading: false,
       image: null as any,