Merge branch 'dev' into 'test'

Dev

See merge request quanshu/mp-ui-pc!154

src/views/index.vue

@@ -487,8 +487,8 @@ export default {
               interval: 0,
               rotate: 0,
               formatter:function(value){
-                  if(value.length > 7){
-                    return value.substring(0,6) +"..."
+                  if(value.length > 6){
+                    return value.substring(0,4) +"..."
                   }else{
                     return value
                   }
@@ -540,8 +540,8 @@ export default {
               interval: 0,
               rotate: 0,
               formatter:function(value){
-                  if(value.length > 7){
-                    return value.substring(0,6) +"..."
+                  if(value.length > 6){
+                    return value.substring(0,4) +"..."
                   }else{
                     return value
                   }
@@ -763,47 +763,7 @@ export default {
       padding-top: 55px;
     }
 
-    .head {
-      position: absolute;
-      padding: 15px 20px;
-      top: 0;
-      right: 0;
-      left: 0;
-      background: #f5f6f9;
-      z-index: 1;
-
-      &__body {
-        position: relative;
-        .user-box {
-          width: unset;
-          height: 36px;
-          padding: 4px 7px;
-          border: 1px solid #E1E1E1;
-          border-radius: 3px;
-          background-color: white;
-          margin-right: 20px;
-          display: flex;
-          cursor: pointer;
-          .user-icon {
-            background: #ddd;
-            color: white;
-            padding: 5px 6px;
-            border-radius: 50%;
-          }
-          .username {
-            font-size: 12px;
-            margin: 0 8px;
-          }
-        }
 
-
-      .sort-btn {
-          position: absolute;
-          right: 0;
-          top: 0;
-        }
-      }
-    }
     .brief-box-top {
       width: 100%;
       border-radius: 3px;
@@ -873,6 +833,7 @@ export default {
             padding-left: 10px;
             .title {
               font-size: 13px;
+              text-align: left;
             }
             .number {
               font-size: 23px;