Merge branch 'startLogin'

dev-dist/sw.js

@@ -82,7 +82,7 @@ define(['./workbox-5357ef54'], (function (workbox) { 'use strict';
     "revision": "3ca0b8505b4bec776b69afdba2768812"
   }, {
     "url": "index.html",
-    "revision": "0.rcgagrcgb8"
+    "revision": "0.8v4p94jv0c"
   }], {});
   workbox.cleanupOutdatedCaches();
   workbox.registerRoute(new workbox.NavigationRoute(workbox.createHandlerBoundToURL("index.html"), {

postcss.config.js

@@ -4,7 +4,7 @@ module.exports = {
       unitToConvert: 'px', // 需要转换的单位，默认为"px"
       viewportWidth: 1920,
       viewportHeight: 1188, // 设计稿的视口宽度
-      unitPrecision: 5, // 单位转换后保留的精度
+      unitPrecision: 8, // 单位转换后保留的精度
       propList: ['*'], // 能转化为vw的属性列表
       viewportUnit: 'vw', // 希望使用的视口单位
       fontViewportUnit: 'rem', // 字体使用的视口单位

src/components/layout/layoutTop.tsx

@@ -52,7 +52,7 @@ export default defineComponent({
               value={8}
               max={99}
               class={styles.messageBadge}
-              {...{id:"home-3"}}
+              {...{id:"home-2"}}
 
               color={'#FF1036'}>
               <NImage

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

@@ -33,14 +33,14 @@ export default defineComponent({
             top: '0.91rem'
           },
           imgStyle: {
-            width: '647px',
-            height: '223px',
-            left:'-647px',
-            top:'-150px'
+            width: px2vw(647),
+            height: px2vw(223),
+            left:px2vw(-647),
+            top:px2vw(-150)
           },
           btnsStyle: {
-            bottom: '180px',
-            left: '-490px'
+            bottom:px2vw(180),
+            left: px2vw(-490)
           },
           eleRectPadding: {
             left: 7,
@@ -54,14 +54,14 @@ export default defineComponent({
           ele: '',
           img: getImage('attent2.png'),
           imgStyle: {
-            top: '100%',
-            left: '-317px',
-            width: '477px',
-            height: '277px'
+            left:  px2vw(-290),
+            top: px2vw(20),
+            width:px2vw(477),
+            height: px2vw(277)
           },
           btnsStyle: {
-            bottom: '90px',
-            left: '-155px'
+            bottom: px2vw(70),
+            left: px2vw(-135)
           },
           boxStyle:{
             borderRadius: '50%'
@@ -77,14 +77,14 @@ export default defineComponent({
           ele: '',
           img: getImage('attent3.png'),
           imgStyle: {
-            top: '100%',
-            left: '-317px',
-            width: '382px',
-            height: '277px'
+            left:px2vw(-290),
+            top: px2vw(20),
+            width:px2vw(382),
+            height: px2vw(277)
           },
           btnsStyle: {
-            bottom: '80px',
-            left: '-155px'
+            bottom: px2vw(70),
+            left: px2vw(-135)
           },
           boxStyle:{
             borderRadius: '50%'
@@ -101,15 +101,17 @@ export default defineComponent({
           img: getImage('attent4.png'),
           imgStyle: {
             top: '100%',
-            left: '-10px',
-            width: '515px',
-            height: '227px'
+            left:  px2vw(-2),
+            width:   px2vw(515),
+            height:  px2vw(227)
           },
           btnsStyle: {
-            bottom: '30px',
-            left: '-30px'
+            bottom: px2vw(30),
+            left: px2vw(-20)
+          },
+          boxStyle:{
+            borderRadius: '50px'
           },
-
           eleRectPadding: {
             left: 7,
             top: 7,

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

@@ -33,13 +33,13 @@ export default defineComponent({
             top: '0.91rem'
           },
           imgStyle: {
-            left: '-105px',
-            width:  '472px',
-            height:  '256px'
+            left:  px2vw(-100),
+            width:  px2vw(472),
+            height: px2vw(256)
           },
           btnsStyle: {
-            bottom:'30px',
-            left: '-90px',
+            bottom:px2vw(30),
+            left: px2vw(-90),
           },
           boxStyle:{
             borderRadius:'25px'
@@ -55,9 +55,9 @@ export default defineComponent({
           ele: '',
           img: getImage('data2.png'),
           imgStyle: {
-            left:  '-105px',
-            width: '509px',
-            height:'230px'
+            left:  px2vw(-100),
+            width: px2vw(509),
+            height: px2vw(230)
           },
           btnsStyle: {
             bottom: '30px',
@@ -79,12 +79,12 @@ export default defineComponent({
           img: getImage('data3.png'),
           imgStyle: {
             top: '100%',
-            left:  '-105px',
-            width: '438px',
-            height:'230px'
+            left:  px2vw(-105),
+            width: px2vw(438),
+            height:px2vw(230)
           },
           btnsStyle: {
-            bottom: '30px',
+            bottom: px2vw(30),
             left: px2vw(-90),
           },
 

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

@@ -33,12 +33,13 @@ export default defineComponent({
             top: '0.91rem'
           },
           imgStyle: {
+            top:  px2vw(-200),
             left: px2vw(295),
             width:  px2vw(840),
             height:  px2vw(295)
           },
           btnsStyle: {
-            bottom:'30px',
+            bottom:px2vw(200),
             left:  px2vw(540),
           },
           boxStyle:{
@@ -55,30 +56,30 @@ export default defineComponent({
             height:14
           }
         },
-        {
-          ele: '',
-          img: getImage('home2.png'),
-          imgStyle: {
-            top: '100%',
-            left:  px2vw(-250),
-            width: px2vw(401),
-            height: px2vw(227)
-          },
-          btnsStyle: {
-            bottom: '30px',
-            left: px2vw(-90),
-          },
-          boxStyle:{
-            borderRadius:'25px'
-          },
-          eleRectPadding:{
-            left:7,
-            top:7,
-            width:14,
-            height:14
-          }
+        // {
+        //   ele: '',
+        //   img: getImage('home2.png'),
+        //   imgStyle: {
+        //     top: '100%',
+        //     left:  px2vw(-250),
+        //     width: px2vw(401),
+        //     height: px2vw(227)
+        //   },
+        //   btnsStyle: {
+        //     bottom: '30px',
+        //     left: px2vw(-90),
+        //   },
+        //   boxStyle:{
+        //     borderRadius:'25px'
+        //   },
+        //   eleRectPadding:{
+        //     left:7,
+        //     top:7,
+        //     width:14,
+        //     height:14
+        //   }
 
-        },
+        // },
         {
           ele: '',
           img: getImage('home3.png'),

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

@@ -61,7 +61,9 @@ export default defineComponent({
             bottom: '30px',
             left: px2vw(-60),
           },
-
+          boxStyle:{
+            borderRadius: '25px'
+          },
           eleRectPadding:{
             left:7,
             top:7,
@@ -164,7 +166,7 @@ export default defineComponent({
               </div>
               <div
                 class={styles.box}
-                style={{...data.box}}
+                style={{...data.box,...data.steps[data.step].boxStyle}}
                 id={`modeType-${data.step}`}>
 
                 {data.steps.map((item: any, index) => (

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

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

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

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

src/views/attend-class/index.tsx

@@ -642,7 +642,7 @@ export default defineComponent({
             <Transition name="right">
               {activeData.model && (
                 <div
-                  id="attent-0"
+
                   class={styles.rightFixedBtns}
                   onClick={(e: Event) => {
                     e.stopPropagation();
@@ -659,7 +659,7 @@ export default defineComponent({
                     }}>
                     <img src={iconUp} />
                   </div>
-
+                    <div   id="attent-0">
                   <div
                     class={[styles.fullBtn, styles.point]}
                     onClick={() => (popupData.open = true)}>
@@ -680,6 +680,7 @@ export default defineComponent({
                     }}>
                     <img src={iconDown} />
                   </div>
+                  </div>
                 </div>
               )}
             </Transition>

src/views/home/index.module.less

@@ -17,7 +17,7 @@
   background-color: #fff;
   position: relative;
   margin-bottom: 20px;
-  padding: 32px;
+  padding: 20px;
 }
 
 .welcomeInfo {
@@ -85,6 +85,17 @@
   display: flex;
   align-items: center;
 
+  .userName {
+    left: 218px;
+    top: 28px;
+    position: absolute;
+    font-size: 26px;
+    font-family: Alibaba-PuHuiTi-B, Alibaba-PuHuiTi;
+    font-weight: bold;
+    line-height: 35px;
+
+  }
+
   .teacherWoman {
     position: absolute;
     left: 0;
@@ -222,9 +233,9 @@
   display: flex;
   align-items: center;
   background: url('./images/tool_bg.png') no-repeat left bottom #fff;
-  background-size: 108px 84px;
+  background-size: 86px 66px;
   border-radius: 16px;
-  padding: 32px 48px 32px 54px;
+  padding: 21px 32px 21px 54px;
 
   .toolTips {
     width: 370px;
@@ -267,16 +278,16 @@
     align-items: center;
 
     img {
-      width: 174px;
-      height: 146px;
-      margin: 6px 14px 10px;
+      width: 159px;
+      height: 134px;
+      margin: 5px 13px 10px;
     }
 
     .toolItem {
-      width: 203px;
+      width: 185px;
       background: #EBF5FF;
       border-radius: 16px;
-      margin-right: 40px;
+      margin-right: 36px;
       text-align: center;
 
       &:last-child {

src/views/home/index.tsx

@@ -346,7 +346,7 @@ export default defineComponent({
       <div class={styles.homeWrap}>
         <div class={styles.homeInfoLeft}>
           <div class={styles.homeBanner}>
-            <div class={styles.welcomeInfo}>
+            {/* <div class={styles.welcomeInfo}>
               <div class={styles.userInfo}>
                 <div class={styles.userName}>
                   Hi，{userStore.getUserInfo?.nickname} {formatDateToDay()}～
@@ -362,12 +362,19 @@ export default defineComponent({
                   <i></i>
                 </NButton>
               </div>
-            </div>
+            </div> */}
             {/* <div class={styles.centerInfo}>11111</div> */}
-            <div class={styles.applyInfo}>
+            <div class={styles.applyInfo} id="home-1">
               <div class={styles.centerInfo} id="home-0"></div>
-              <div class={styles.applyInfo} id="home-2"></div>
 
+              <div class={styles.userInfo}>
+                <div class={styles.userName}>
+                  Hi，{userStore.getUserInfo?.nickname} {formatDateToDay()}～
+                </div>
+                {/* <div class={styles.userTime}>
+                  {dayjs().format('MM月DD日')}，{weekToCN[dayjs().day()]}
+                </div> */}
+              </div>
               {userStore.getUserInfo.gender === 1 ? (
                 <img src={teacherMan} class={styles.teacherMan} />
               ) : (
@@ -524,7 +531,7 @@ export default defineComponent({
               </div>
             </div>
             <img src={iconTo} class={styles.iconTo} />
-            <div class={styles.toolFunction} id="home-4">
+            <div class={styles.toolFunction} id="home-3">
               <div class={[styles.toolItem, styles.item1]}>
                 <img src={t1} />
                 <p class={styles.toolMemo}>提升效率，练习好节奏</p>

src/views/natural-resources/index.tsx

@@ -11,7 +11,7 @@ export default defineComponent({
     return () => (
       <div class={styles.listWrap}>
         <NTabs
-          defaultValue="shareResources"
+          defaultValue="myResources"
           paneClass={styles.paneTitle}
           justifyContent="center"
           animated