Merge branch 'startLogin'

src/components/layout/index.tsx

@@ -14,6 +14,7 @@ import setTimeImage from './images/setTimeImage.png';
 import dragingBoxIcon from './images/dragingBoxIcon.png';
 import TimerMeter from '../timerMeter';
 import { useRoute } from 'vue-router';
+import { vaildUrl } from '/src/utils/urlUtils';
 export default defineComponent({
   name: 'layoutView',
   setup() {
@@ -223,7 +224,7 @@ export default defineComponent({
           <div
             class={styles.modeWrap}
            >
-              <iframe src="https://test.lexiaoya.cn/metronome/"  scrolling='no'  frameborder="0" width='100%'  height={'650px'} ></iframe>
+              <iframe src={ `${vaildUrl()}/metronome/?id=${new Date().getTime()}`  } scrolling='no'  frameborder="0" width='100%'  height={'650px'} ></iframe>
           </div>
         </NModal>
         <NModal v-model:show={showModalTone.value}>

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

@@ -34,14 +34,14 @@ export default defineComponent({
             top: '0.91rem'
           },
           imgStyle: {
-            top:(-4),
+            top:px2vw(-4),
             left: px2vw(-50),
             width:  px2vw(420),
             height:  px2vw(228)
           },
           btnsStyle: {
-            bottom:'30px',
-            left:  px2vw(90),
+            bottom:px2vw(35),
+            left:  px2vw(111),
           },
           eleRectPadding:{
             left:7,
@@ -61,7 +61,7 @@ export default defineComponent({
           },
           btnsStyle: {
             bottom: '30px',
-            left: px2vw(-500),
+            left: px2vw(-488),
           },
 
           eleRectPadding:{
@@ -77,13 +77,13 @@ export default defineComponent({
           ele: '',
           img: getImage('lessons3.png'),
           imgStyle: {
-            top: px2vw(-223),
+            top: px2vw(-4),
             left:  px2vw(-471),
             width: px2vw(471),
             height:px2vw(223)
           },
           btnsStyle: {
-            bottom: px2vw(220),
+            bottom: px2vw(20),
             left: px2vw(-310),
           },
 
@@ -100,13 +100,13 @@ export default defineComponent({
           ele: '',
           img: getImage('lessons4.png'),
           imgStyle: {
-            top: '100%',
-            left:  '-265px',
-            width: '515px',
-            height:'227px'
+            top: px2vw(-4),
+            left:  px2vw(-252),
+            width:  px2vw(515),
+            height: px2vw(227)
           },
           btnsStyle: {
-            bottom: '30px',
+            bottom: px2vw(30),
             left: px2vw(-90),
           },
 
@@ -122,14 +122,14 @@ export default defineComponent({
           ele: '',
           img: getImage('lessons5.png'),
           imgStyle: {
-            top: '100%',
-            left:  '-290px',
-            width: '648px',
-            height:'228px'
+            top: px2vw(-4),
+            left:  px2vw(-290),
+            width: px2vw(648),
+            height:px2vw(228)
           },
           btnsStyle: {
-            bottom: '30px',
-            left: px2vw(-90),
+            bottom: px2vw(30),
+            left: px2vw(-127),
           },
 
           eleRectPadding:{
@@ -237,7 +237,7 @@ export default defineComponent({
                     }: item.type=='left'?{
                       display: index === data.step ? '' : 'none',
 
-                     top: `${ parseFloat(data.box?.height)/2-parseFloat(item.imgStyle?.height)/2 -14}px`,
+                     top: `${ parseFloat(data.box?.height)/2 - parseFloat(item.imgStyle?.height)*1920/100/2 -14}px`,
                     }:{
                       display: index === data.step ? '' : 'none',
                       left: `${item.eleRect?.left}px`,

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

@@ -34,13 +34,14 @@ export default defineComponent({
             top: '0.91rem'
           },
           imgStyle: {
-            left: '-4.4em',
-            width:  '534px',
-            height:  '228px'
+            top:px2vw(-4),
+            left: px2vw(0),
+            width:  px2vw(534),
+            height:  px2vw(228)
           },
           btnsStyle: {
-            bottom:'30px',
-            left: '90px',
+            bottom:px2vw(40),
+            left: px2vw(159),
           },
           eleRectPadding:{
             left:7,
@@ -53,14 +54,14 @@ export default defineComponent({
           ele: '',
           img: getImage('music2.png'),
           imgStyle: {
-            top: '100%',
-            left:  '-205px',
-            width: '420px',
-            height:'228px'
+            top:px2vw(-4),
+            left:  px2vw(-205),
+            width:px2vw(420),
+            height:px2vw(228)
           },
           btnsStyle: {
-            bottom: '30px',
-            left: px2vw(-60),
+            bottom: px2vw(35),
+            left: px2vw(-48),
           },
           boxStyle:{
             borderRadius: '25px'
@@ -83,10 +84,12 @@ export default defineComponent({
             height: px2vw(304)
           },
           btnsStyle: {
-            bottom: '90px',
-            left:px2vw(20),
+            bottom: px2vw(100),
+            left:px2vw(30),
+          },
+          boxStyle:{
+            borderRadius: '40px'
           },
-
           eleRectPadding:{
             left:7,
             top:7,

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

@@ -35,13 +35,14 @@ export default defineComponent({
             top: '0.91rem'
           },
           imgStyle: {
+            top: px2vw(-4),
             left: px2vw(-240),
             width: px2vw(556),
             height:  px2vw(257),
           },
           btnsStyle: {
             bottom: px2vw(30),
-            left:  px2vw(90),
+            left:  px2vw(-80),
           },
           eleRectPadding:{
             left:14,

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

@@ -35,13 +35,14 @@ export default defineComponent({
             top: '0.91rem'
           },
           imgStyle: {
-            left: '-263px',
-            width:  '553px',
-            height:  '229px'
+            top: px2vw(-4),
+            left: px2vw(-263),
+            width:  px2vw(553),
+            height:  px2vw(229)
           },
           btnsStyle: {
-            bottom:'30px',
-            left: '-90px',
+            bottom:px2vw(30),
+            left: px2vw(-102),
           },
           eleRectPadding:{
             left:14,
@@ -57,14 +58,14 @@ export default defineComponent({
           ele: '',
           img: getImage('shareResources2.png'),
           imgStyle: {
-            top: '100%',
-            left:  '0',
-            width: '515px',
-            height:'227px'
+
+            left:  px2vw(134),
+            width: px2vw(515),
+            height:px2vw(227)
           },
           btnsStyle: {
-            bottom: '75px',
-            left: '125px',
+            bottom: px2vw(75),
+            left: px2vw(253),
           },
 
           eleRectPadding:{

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

@@ -34,13 +34,14 @@ export default defineComponent({
             top: '0.91rem'
           },
           imgStyle: {
-            left: '-250px',
-            width:  '591px',
-            height:  '227px'
+            top: px2vw(-4),
+            left: px2vw(-250),
+            width:  px2vw(591),
+            height:  px2vw(227)
           },
           btnsStyle: {
-            bottom:'30px',
-            left: '-90px',
+            bottom:px2vw(30),
+            left: px2vw(-90),
           },
           eleRectPadding:{
             left:7,

src/views/home/index.tsx

@@ -48,6 +48,7 @@ import TheEmpty from '/src/components/TheEmpty';
 import { setTabsCaches } from '/src/hooks/use-async';
 import HomeGuide from '/src/custom-plugins/guide-page/home-guide';
 import TimerMeter from '/src/components/timerMeter';
+import { vaildUrl } from '/src/utils/urlUtils';
 export const formatDateToDay = () => {
   const hours = dayjs().hour();
   if (hours < 12) {
@@ -701,7 +702,7 @@ export default defineComponent({
           <div
             class={styles.modeWrap}
            >
-              <iframe src="https://test.lexiaoya.cn/metronome/"  scrolling='no'  frameborder="0" width='100%'  height={'650px'} ></iframe>
+              <iframe src={ `${vaildUrl()}metronome/?id=${new Date().getTime()}`  }  scrolling='no'  frameborder="0" width='100%'  height={'650px'} ></iframe>
           </div>
         </NModal>
 

src/views/studentList/index.module.less

@@ -226,6 +226,10 @@
       color: rgba(0, 0, 0, 0.88);
     }
 
+    .n-data-table-td {
+      padding: 12px 20px;
+    }
+
     .n-data-table-th__title-wrapper {
       &::after {
         content: '';