Merge branch 'startLogin'

src/custom-plugins/guide-page/data-guide.tsx

@@ -34,13 +34,14 @@ export default defineComponent({
             top: '0.91rem'
           },
           imgStyle: {
+            top: px2vw(-4),
             left:  px2vw(-100),
             width:  px2vw(472),
             height: px2vw(256)
           },
           btnsStyle: {
             bottom:px2vw(30),
-            left: px2vw(-90),
+            left: px2vw(-110),
           },
           boxStyle:{
             borderRadius:'25px'
@@ -56,13 +57,14 @@ export default defineComponent({
           ele: '',
           img: getImage('data2.png'),
           imgStyle: {
+            top: px2vw(-4),
             left:  px2vw(-100),
             width: px2vw(509),
             height: px2vw(230)
           },
           btnsStyle: {
-            bottom: '30px',
-            left: px2vw(-90),
+            bottom:px2vw(30),
+            left: px2vw(-110),
           },
           boxStyle:{
             borderRadius:'25px'
@@ -86,7 +88,7 @@ export default defineComponent({
           },
           btnsStyle: {
             bottom: px2vw(30),
-            left: px2vw(-90),
+            left: px2vw(-115),
           },
 
           boxStyle:{

src/custom-plugins/guide-page/myColloge-guide.tsx

@@ -31,14 +31,14 @@ export default defineComponent({
           ele: '',
           img: getImage('myColloge1.png'),
           imgStyle: {
-            top:  px2vw(0),
+            top:  px2vw(-4),
             left:   px2vw(630),
             width:  px2vw(458),
             height: px2vw(291)
           },
           btnsStyle: {
             bottom: px2vw(96),
-            left:px2vw(780),
+            left:px2vw(790),
           },
 
           eleRectPadding:{

src/custom-plugins/guide-page/teacher-guide.tsx

@@ -34,13 +34,14 @@ export default defineComponent({
             top: '0.91rem'
           },
           imgStyle: {
-            left: '-70px',
-            width:  '472px',
-            height:  '230px'
+            top:px2vw(-4),
+            left: px2vw(-75),
+            width:  px2vw(472),
+            height:  px2vw(230),
           },
           btnsStyle: {
-            bottom:'30px',
-            left: '-90px',
+            bottom:px2vw(30),
+            left: px2vw(-84),
           },
           boxStyle:{
             borderRadius:'25px'
@@ -56,13 +57,14 @@ export default defineComponent({
           ele: '',
           img: getImage('teacher2.png'),
           imgStyle: {
-            left:  '-168px',
-            width: '599px',
-            height:'230px'
+            top:px2vw(-4),
+            left:  px2vw(-142),
+            width: px2vw(559),
+            height:px2vw(230)
           },
           btnsStyle: {
-            bottom: '30px',
-            left: px2vw(-90),
+            bottom: px2vw(30),
+            left: px2vw(-154),
           },
           boxStyle:{
             borderRadius:'25px'

src/views/classList/index.tsx

@@ -130,6 +130,7 @@ export default defineComponent({
         {
           title: '操作',
           key: 'id',
+
           render(row: any, index: number) {
             return (
               <div>

src/views/classList/modals/createClass.tsx

@@ -38,6 +38,7 @@ export default defineComponent({
       currentClass: null
     });
     const submitForms = () => {
+      data.uploading = true
       foemsRef.value.validate(async (error: any) => {
         console.log(createClassForm);
         console.log(error);
@@ -49,6 +50,7 @@ export default defineComponent({
           message.success('新增成功');
           emit('close');
           emit('getList');
+          data.uploading = false
         } catch (e) {
           console.log(e);
         }

src/views/setting/modal/forgotPassword.tsx

@@ -158,6 +158,8 @@ export default defineComponent({
                   type="text"
                   maxlength={6}
                   placeholder="请输入验证码"
+                  {...{  autocomplete:"off"}}
+
                   inputProps={{ autocomplete: 'off' }}
                   class={styles.sendInput}></NInput>
                 <NButton

src/views/studentList/studentDetail.tsx

@@ -92,6 +92,7 @@ export default defineComponent({
               <h4 class={styles.studentGender}>
                 {state.studentInfo.nickname}{' '}
                 <NImage
+                previewDisabled
                   src={
                     state.studentInfo.gender ? maleIcon : femaleIcon
                   }></NImage>