Merge branch 'stat' of https://codeup.aliyun.com/6265f483e4166464dc2f9c14/boeu/portal into stat

src/assets/styles/portal-index.scss

@@ -440,6 +440,17 @@
 @media screen and (max-width: 1366px){
   .xindex-content{
     width: 1100px;
+  }
+  .personal-panel{
+    width: 300px;
+    height: 320px;
+    padding: 25px 40px;
+    .personal-box {
+      margin-left: 0px;
+      margin-top: 0px;
+      margin-bottom: 0px;
+  }
+  
   }
   //课程卡片样式
   .xindex-course{
@@ -668,6 +679,16 @@
 @media screen and (max-width: 1680px) and (min-width:1367px){
   .xindex-content{
     width: 1366px;
+  }
+   .personal-panel{
+    width: 356px; 
+    height: 370px;
+    padding: 30px 45px;
+    .personal-box{
+        margin-left: 16px;
+        margin-top: 20px;
+        margin-bottom: 28px;
+    }
   }
   .xindex-course{
     width: 320px;
@@ -879,6 +900,15 @@
   .xindex-content{
       width: 1690px;
   }
+  .personal-panel{
+    width: 356px; 
+    height: 370px;
+    padding: 30px 45px;
+    .personal-box{
+        margin-top: 20px;
+        margin-bottom: 28px;
+    }
+  }
   .xindex-course{
       width: 400px;
       padding: 30px;

src/assets/styles/portal.scss

@@ -237,18 +237,13 @@ body {margin: 0px;padding: 0px;}
     user-select: none;
   }
   .course-info { //图片下面的一行信息
-    // margin: 5px 15px;
-    // padding-bottom: 10px;
     display: flex;
     justify-content: space-between;
     line-height: 30px;
     .course-info-user{
       font-size: 14px;
       color: #6E7B84;
-      width: 60%;
-      .course-info-author{
-
-      }
+      flex: 1;
       .course-info-studys {
         margin-left: 12px;
         -moz-user-select: none; /*火狐*/
@@ -260,7 +255,7 @@ body {margin: 0px;padding: 0px;}
     }
     .course-info-score{
       display:flex;
-      width: 40%;
+      margin-left: auto;
       ::v-deep .cor-praises {
           // position: absolute;
           -moz-user-select: none; /*火狐*/
@@ -331,7 +326,7 @@ body {margin: 0px;padding: 0px;}
     padding:20px;
     margin-right: 20px;
     .course-image-box {
-      width: 200px;
+      width: 100%;
       height: 114px;
     }
   }
@@ -383,7 +378,7 @@ body {margin: 0px;padding: 0px;}
     padding:25px;
     margin-right: 25px;
     .course-image-box {
-      width: 320px;
+      width: 100%;
       height: 180px;
     }
   }

src/views/Index.vue

@@ -18,17 +18,17 @@
         <!-- <img style="width:68px;height:68px" src="/images/Avatarman.png" alt=""> -->
         <p class="personal-name">{{userInfo.name}} {{userInfo.userNo}}</p>
         <p class="personal-info">{{userInfo.departName}}</p>
-        <div class="personal-box"><span>代办</span><span>3个待处理</span><img class="personal-box-img"
+        <div class="personal-box"><span>代办</span><span>3个待处理 <img src="/images/homeWu/Pending.png" alt=""> </span> <img class="personal-box-img"
             src="/images/homeWu/agency.png" alt="" srcset=""></div>
         <ul class="personal-ul">
           <li>
             <span class="label">累计学习</span>
-            <p><span>{{userData.studyHourValue}}</span>小时</p>
+            <p><span>{{userData.studyHourValue}}</span>h</p>
           </li>
-          <li>
+          <!-- <li>
             <span class="label">经验值等级</span>
             <p><span>{{userData.level}}</span></p>
-          </li>
+          </li> -->
           <li>
             <span class="label">我的U币</span>
             <p><span>{{userData.coinValue}}</span>个</p>
@@ -935,13 +935,10 @@
     position: absolute;
     right: 172px;
     top: 105px;
-    width: 356px;
-    height: 370px;
-    background: rgba(0, 0, 0, 0.39);
+    background: url('/images/homeWu/personal-bgimg.png');
     border-radius: 8px;
     z-index: 999;
     backdrop-filter: blur(10px);
-    padding: 38px 47px 31px 32px;
     text-align: center;
     color: #fff;
 
@@ -960,27 +957,28 @@
       font-weight: 600;
       font-size: 18px;
       margin-top: 12px;
+      color: #333333;
     }
 
     .personal-info {
       font-size: 14px;
-      color: #C1C1C1;
+      color: #000000;
       margin-top: 10px;
     }
 
     .personal-box {
-      width: 240px;
-      height: 60px;
-      background: rgba(0, 0, 0, 0.39);
-      border-radius: 8px;
-      margin-left: 16px;
-      margin-top: 20px;
-      margin-bottom: 28px;
-      padding: 19px 14px 19px 22px;
+      width: 100%;
+      height: 47px;
+      background: #387DF7;
+      border-radius: 4px;
+      line-height: 47px;
+      padding-left: 20px ;
+      padding-right: 40px;
+      box-sizing: border-box;
       display: flex;
+      margin-top: 20px;
       justify-content: space-between;
       position: relative;
-
       .personal-box-img {
         position: absolute;
         width: 24px;
@@ -992,21 +990,25 @@
     }
 
     .personal-ul {
-
       display: flex;
-      justify-content: space-between;
-
+      li{
+        flex: 1;
+        text-align: center;
+      }
       .label {
-        color: #fff;
+        color: #333;
         font-size: 12px;
+        text-align: center;
       }
 
       p {
-        margin-top: 10px;
-
+        margin-top: 5px;
+        text-align: center;
+        color: #000;
         span {
           font-size: 22px;
-          color: #ffffff;
+          text-align: center;
+          color: #333;
         }
       }
     }