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

src/assets/styles/portal.scss

@@ -370,6 +370,12 @@ body {margin: 0px;padding: 0px;}
   .title-myqalist{
       margin-right: 5px !important;
   }
+  .btn-right{
+    .btn{
+      width: 120px !important;
+      height: 40px !important;
+  }
+  }
   .course-card {
     padding:20px;
     margin-right: 20px;
@@ -384,6 +390,17 @@ body {margin: 0px;padding: 0px;}
       height: 122px;
     }
   }
+  .course-tit{
+    float: none !important;
+  }
+  .sysType-box{
+    margin-top: 10px;
+    float: none !important;
+  }
+  .tit-float{
+    height: 45px !important;
+  }
+
 }
 
 @media screen and (max-width: 1680px) and (min-width:1367px){

src/components/HomePage/courseList.vue

@@ -15,26 +15,28 @@
                 <course-image width="254px" height="144px" :course="item.info"></course-image>
             </div>
             <div class="data-cen pointer" @click="jumpDetail(item)">
-                <h6 class="course-tit portal-title-tow">{{item.info.courseName || item.contentInfo}}
+              <div class="tit-float" >
-                  <span class="sysType-name" v-if="item.info.sysType1 !='' && item.info.sysType1 != 0">{{sysTypeName(item.info.sysType1)}}</span>
+                 <h6 class="course-tit portal-title-tow">{{item.info.courseName || item.contentInfo}}
-                  <span class="sysType-name" v-if="item.info.sysType2 !='' && item.info.sysType2 != 0">{{sysTypeName(item.info.sysType2)}}</span>
-                  <span class="sysType-name" v-if="item.info.sysType3 !='' && item.info.sysType3 != 0">{{sysTypeName(item.info.sysType3)}}</span>
-                   <span class="score-info" v-if="toScore(item.info.lastScore) > 0">{{toScore(item.info.lastScore)}}分</span>
                 </h6>
+                 <div class="sysType-box">
+                     <span class="sysType-name" v-if="item.info.sysType1 !='' && item.info.sysType1 != 0">{{sysTypeName(item.info.sysType1)}}</span>
+                     <span class="sysType-name" v-if="item.info.sysType2 !='' && item.info.sysType2 != 0">{{sysTypeName(item.info.sysType2)}}</span>
+                     <span class="sysType-name" v-if="item.info.sysType3 !='' && item.info.sysType3 != 0">{{sysTypeName(item.info.sysType3)}}</span>
+                     <span  class="score-info" v-if="toScore(item.info.lastScore) > 0">{{toScore(item.info.lastScore)}}分</span>
+                 </div>
+              </div>
+               
                 <p class="title-info">{{item.info.summary}}</p>
                 <div class="pro-line"> <div>当前进度：</div> <div style="width:200px"><el-progress :percentage="item.info.progress"></el-progress></div></div>
                 <p class="portal-time">最新一次学习时间：{{item.eventTime}}</p>
+                
             </div>
-            <div style="width:150px">
+            <div class="btn-box">
-                <!-- <div class="follow-hide pointer" style="text-align: right;" v-if="!isDynamic && personal">
+                  <div class="btn-right">
-                    <span v-if="item.hidden">已隐藏</span>
+                     <el-button class="btn" type="primary" @click="jumpDetail(item)">{{personal? '继续学习' : '我也去学'}}</el-button>
-                    <span v-else  @click="emitHide(item.id)">  <svg-icon style="margin-right: 10px;font-size:22px;padding-top: 4px;" icon-class="eyes"></svg-icon>隐藏 </span>
+                  </div>
-                </div> -->
+             </div>
-                <div class="btn-right">
+            
-                   <!-- <el-button class="btn" type="primary" @click="jumpDetail(item)">{{item.eventKey ==  'Praise' ? '我也去学' : item.aid == userInfo.aid? '继续学习' : '我也去学'}}</el-button> -->
-                   <el-button class="btn" type="primary" @click="jumpDetail(item)">{{personal? '继续学习' : '我也去学'}}</el-button>
-                </div>
-            </div>
           </div>
 
         </li>
@@ -110,6 +112,23 @@
   </script>
 
   <style lang="scss" scoped>
+    .tit-float{
+      height: 25px;
+    }
+    .sysType-box{
+      float: left;
+    }
+    .sysType-name{
+              display: inline-block;
+              padding:0px 8px;
+              line-height: 24px;
+              font-size: 12px;
+              border-radius:2px;
+              margin-right: 8px;
+              color: #2C68FF;
+              height: 24px;
+              background: rgba(44,104,255,0.06);
+            }
     .data-info-ul{
         margin: 0;
         // padding-top: 32px;
@@ -125,18 +144,7 @@
             margin: 0;
             font-size: 18px !important;
             line-height: 25px;
-            .sysType-name{
+            float: left;
-              display: inline-block;
-              padding:0px 8px;
-              // margin-top: 5px;
-              line-height: 24px;
-              font-size: 12px;
-              border-radius:2px;
-              margin-right: 8px;
-              color: #2C68FF;
-              height: 24px;
-              background: rgba(44,104,255,0.06);
-            }
         }
         .title-info{
             font-size: 14px;
@@ -144,7 +152,7 @@
             margin-top: 14px;
         }
         .pro-line{
-           margin: 30px 0 16px 0;
+           margin: 22px 0 16px 0;
            font-size: 14px;
            color: #333333;
            display: flex;

src/views/ucurrency/Index.vue

@@ -6,7 +6,7 @@
           <i class="el-icon-arrow-right"></i> </span>
         <el-button icon="el-icon-document" @click="exportRecord()">导出记录</el-button>
       </div>
-      <div style="max-height:600px;overflow-y:auto;padding-right:30px">
+      <div style="max-height:600px;overflow-y:auto;padding-right:30px;min-width: 370px;">
         <div class="Ubi-hist">
           <h6>U币历史记录</h6><span>（最多保留近7天的记录）</span>
           <div v-show="isShowChart" >