Merge branch 'dev' into 'test'

Dev

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

src/views/index.vue

@@ -11,7 +11,7 @@
              <el-col :span="6">
                <div class="brief-item">
                  <div class="info">
-                   <div class="title">
+                   <div class="m-title">
                     实时交易金额
                    </div>
                    <div
@@ -46,7 +46,7 @@
              <el-col :span="6">
                <div class="brief-item">
                  <div class="info">
-                   <div class="title">
+                   <div class="m-title">
                     交易用户
                    </div>
                    <div
@@ -81,7 +81,7 @@
              <el-col :span="6">
                <div class="brief-item">
                   <div class="info">
-                    <div class="title">
+                    <div class="m-title">
                      盲票销售张数
                     </div>
                     <div
@@ -108,7 +108,6 @@
                          </span>
                          %
                        </span>
-
                      </div>
                    </div>
                   </div>
@@ -117,7 +116,7 @@
              <el-col :span="6">
                <div class="brief-item">
                  <div class="info">
-                   <div class="title">
+                   <div class="m-title">
                     新增经销商
                    </div>
                    <div
@@ -784,7 +783,7 @@ export default {
       .brief-item {
         cursor: pointer;
         // width: calc(25% - 20px);
-        height: 125px;
+        // height: 125px;
         box-shadow: 0 0 16px 0 rgba(0,0,0,0.08);
         border-radius: 3px;
         padding: 15px 0px;
@@ -804,20 +803,22 @@ export default {
           }
         }
         .info {
-          overflow: hidden;
+          // overflow: hidden;
           padding-left: 10px;
-          .title {
+          .m-title {
             font-size: 13px;
             text-align: left;
+            margin: 0px;
           }
           .number {
             font-size: 23px;
             font-weight: bold;
             line-height: 1;
-            margin-top: 8px;
+            // margin-top: 8px;
             margin-right: 5px;
-            // white-space: nowrap;
-            // text-overflow: ellipsis;
+            padding-top:8px;
+            white-space: nowrap;
+            text-overflow: ellipsis;
             overflow: hidden;
           }
         }