Merge branch 'startLogin'

src/components/timerMeter/components/countdown.tsx

@@ -149,24 +149,23 @@ export default defineComponent({
     })
    const addSecondTimer = (num:number)=>{
 
-    nextTick(()=>{
-      const lastStr = getSecond(count.value)
-      count.value+=num
-      count.value >3599?count.value = 3599: count.value
-      const str = getSecond(count.value)
-      for (let i = 0; i < flipObjs.value.length; i++) {
-        if (lastStr[i] === str[i]) {
-          continue
-        }
-        flipObjs.value[i].value.flipDown(lastStr[i], str[i])
+
+    const lastStr = getSecond(count.value)
+    count.value+=num
+    count.value >3599?count.value = 3599: count.value
+    const str = getSecond(count.value)
+    for (let i = 0; i < flipObjs.value.length; i++) {
+      if (lastStr[i] === str[i]) {
+        continue
       }
-      mine.value = Math.floor(count.value / 60)
-      second.value = Math.floor(count.value % 60)
-    })
+      flipObjs.value[i].value.flipDown(lastStr[i], str[i])
+    }
+    mine.value = Math.floor(count.value / 60)
+    second.value = Math.floor(count.value % 60)
 
    }
   const minusSecondTimer = (num:number)=>{
-    nextTick(()=>{
+
       const lastStr = getSecond(count.value)
       count.value -=num
       count.value <0?count.value = 0: count.value
@@ -179,12 +178,15 @@ export default defineComponent({
       }
        mine.value = Math.floor(count.value / 60)
       second.value = Math.floor(count.value % 60)
-    })
+
+
+
 
   }
 
   const updateMin = ()=>{
-    nextTick(()=>{
+
+    setTimeout(()=>{
       console.log(mine.value, count.value)
       const lastStr = getSecond(count.value)
       count.value = mine.value*60+second.value
@@ -196,12 +198,13 @@ export default defineComponent({
         }
         flipObjs.value[i].value.flipUp(lastStr[i], str[i])
       }
-    })
+    },600)
+
 
 
   }
   const updateSecond=()=>{
-    nextTick(()=>{
+    setTimeout(()=>{
       console.log(mine.value)
       const lastStr = getSecond( count.value)
       count.value = mine.value*60+second.value
@@ -212,7 +215,9 @@ export default defineComponent({
         }
         flipObjs.value[i].value.flipUp(lastStr[i], str[i])
       }
-    })
+    },600)
+
+
   }
 
   watch(()=> count.value,(val)=>{

src/components/timerMeter/modals/flipper.vue

@@ -43,9 +43,9 @@ export default {
     },
     _flip(type, front, back) {
       // 如果处于翻转中，则不执行
-      if (this.isFlipping) {
-        return false
-      }
+      // if (this.isFlipping) {
+      //   return false
+      // }
       this.frontTextFromData = front
       this.backTextFromData = back
       // 根据传递过来的type设置翻转方向

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

@@ -34,13 +34,14 @@ export default defineComponent({
             top: '0.91rem'
           },
           imgStyle: {
-            left: '-294px',
-            width:  '648px',
-            height:  '227px'
+            top: px2vw(-4),
+            left:  px2vw(-294),
+            width:   px2vw(648),
+            height:  px2vw(227)
           },
           btnsStyle: {
-            bottom:'30px',
-            left: '-90px',
+            bottom:px2vw(30),
+            left: px2vw(-130),
           },
           eleRectPadding:{
             left:7,
@@ -53,18 +54,16 @@ export default defineComponent({
           ele: '',
           img: getImage('class2.png'),
           imgStyle: {
-            top: '100%',
-            left:  '-283px',
-            width: '515px',
-            height:'227px'
+            top: px2vw(-4),
+            left:   px2vw(-276),
+            width:  px2vw(515),
+            height:px2vw(227)
           },
           btnsStyle: {
-            bottom: '30px',
-            left: px2vw(-90),
-          },
-          boxStyle:{
-            borderRadius:'25px'
+            bottom:px2vw(30),
+            left: px2vw(-110),
           },
+
           eleRectPadding:{
             left:7,
             top:7,
@@ -77,13 +76,14 @@ export default defineComponent({
           ele: '',
           img: getImage('class3.png'),
           imgStyle: {
-            width:  '437px',
-            height:  '227px',
-            left:'-282px'
+            top: px2vw(-4),
+            width:  px2vw(437),
+            height:   px2vw(227),
+            left: px2vw(-276)
           },
           btnsStyle: {
-            bottom: '30px',
-            left: '-130px',
+            bottom:  px2vw(30),
+            left:  px2vw(-113),
           },
           eleRectPadding:{
             left:7,

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

@@ -34,14 +34,14 @@ export default defineComponent({
             top: '0.91rem'
           },
           imgStyle: {
-            top:  px2vw(-200),
-            left: px2vw(295),
-            width:  px2vw(840),
+            top:  px2vw(-150),
+            left: px2vw(563),
+            width:  px2vw(734),
             height:  px2vw(295)
           },
           btnsStyle: {
-            bottom:px2vw(200),
-            left:  px2vw(540),
+            bottom:px2vw(188),
+            left:  px2vw(805),
           },
           boxStyle:{
             border:'none',
@@ -90,7 +90,7 @@ export default defineComponent({
             transform: 'rotate(180deg)'
           },
           imgStyle: {
-
+            top: px2vw(-4),
             width:  px2vw(454),
             height:  px2vw(227),
             left:px2vw(282)
@@ -99,6 +99,9 @@ export default defineComponent({
             bottom: '30px',
             left:px2vw(450)
           },
+          boxStyle:{
+            borderRadius: '20px'
+          },
           eleRectPadding:{
             left:44,
             top:44,
@@ -115,6 +118,7 @@ export default defineComponent({
             transform: 'rotate(180deg)'
           },
           imgStyle: {
+            top: px2vw(-4),
             left:  px2vw(-310),
             width:  px2vw(477),
             height:  px2vw(227),
@@ -139,13 +143,13 @@ export default defineComponent({
           },
           imgStyle: {
             top: '0',
-            width:  px2vw(610),
+            width:  px2vw(600),
             height:  px2vw(290),
-            left: px2vw(38)
+            left: px2vw(18)
           },
           btnsStyle: {
-            bottom: '80px',
-            left: px2vw(195),
+            bottom:  px2vw(80),
+            left: px2vw(185),
             'justify-content': 'center',
             padding: 0
           },

src/custom-plugins/guide-page/index.module.less

@@ -111,11 +111,11 @@
     }
 
     .endBtn {
-      width: 144px;
+      width: 124px;
       height: 49px;
       margin-right: 20px;
       background: url('./images/endBtn.png');
-      background-size: 144px 49px;
+      background-size: 124px 49px;
 
       line-height: 49px;
       font-size: 18px;

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

@@ -34,6 +34,7 @@ export default defineComponent({
             top: '0.91rem'
           },
           imgStyle: {
+            top:(-4),
             left: px2vw(-50),
             width:  px2vw(420),
             height:  px2vw(228)

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

@@ -37,13 +37,14 @@ export default defineComponent({
             top: '0.91rem'
           },
           imgStyle: {
+            top:px2vw(-4),
             left: px2vw(-64),
             width:  px2vw(518),
             height:  px2vw(256)
           },
           btnsStyle: {
-            bottom:'30px',
-            left: '-90px',
+            bottom: px2vw(30),
+            left:  px2vw(-74),
           },
           eleRectPadding:{
             left:7,
@@ -56,8 +57,8 @@ export default defineComponent({
           ele: '',
           img: getImage('student2.png'),
           imgStyle: {
-            top: '100%',
-            left:  px2vw(-265),
+            top: px2vw(-4),
+            left:  px2vw(-261),
             width:  px2vw(515),
             height:px2vw(227)
           },

src/views/classList/components/classStudent.tsx

@@ -7,7 +7,8 @@ import {
   NFormItem,
   NImage,
   NSelect,
-  NSpace
+  NSpace,
+  useMessage
 } from 'naive-ui';
 import SearchInput from '@/components/searchInput';
 import CSelect from '@/components/CSelect';
@@ -29,6 +30,7 @@ export default defineComponent({
       },
       tableList: [] as any
     });
+    const message =useMessage()
     const route = useRoute();
     const router = useRouter();
     const search = () => {
@@ -62,6 +64,17 @@ export default defineComponent({
     onMounted(() => {
       getList();
     });
+
+    const copyTo = (text: string) => {
+      const input = document.createElement('input');
+      input.value = text;
+      document.body.appendChild(input);
+      input.select();
+      input.setSelectionRange(0, input.value.length);
+      document.execCommand('Copy');
+      document.body.removeChild(input);
+      message.success('复制成功');
+    };
     const gotoDetail = (row: any) => {
       router.push({
         path: '/classStudentDetail',
@@ -72,11 +85,29 @@ export default defineComponent({
       return [
         {
           title: '学生姓名',
-          key: 'nickname'
+          key: 'nickname',
+          render: (row: any) => {
+            return (
+              <div
+                style={{ userSelect: 'all', cursor: 'pointer' }}
+                onClick={() => copyTo(row.nickname)}>
+                {row.nickname}
+              </div>
+            );
+          }
         },
         {
           title: '手机号',
-          key: 'phone'
+          key: 'phone',
+          render: (row: any) => {
+            return (
+              <div
+                style={{ userSelect: 'all', cursor: 'pointer' }}
+                onClick={() => copyTo(row.phone)}>
+                {row.phone}
+              </div>
+            );
+          }
         },
         {
           title: '性别',

src/views/classList/index.tsx

@@ -111,17 +111,20 @@ export default defineComponent({
       return [
         {
           title: '班级名称',
-          key: 'name'
+          key: 'name',
+          width:'25%'
         },
         {
           title: '学生人数',
-          key: 'preStudentNum'
+          key: 'preStudentNum',
+          width:'25%'
         },
         {
           title: '上次学习',
           key: 'lastStudy',
+          width:'25%',
           render(row: any) {
-            return <TheTooltip content={row.lastStudy ? row.lastStudy : '--'} />;
+            return <TheTooltip maxWidth={300} showContentWidth={300} content={row.lastStudy ? row.lastStudy : '--'} />;
           }
         },
         {

src/views/home/index.module.less

@@ -268,7 +268,7 @@
   }
 
   .iconTo {
-    margin: 0 44px;
+    margin: 0 120px 0 44px;
     width: 38px;
     height: 18px
   }