Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ui/src/views/front/steamBalance.vue

ui/src/views/front/steamBalance.vue

@@ -315,7 +315,8 @@
           <img src="@/assets/steamImg/jiantoulan3.png" style="width:80px;height:347px">
           <img src="@/assets/steamImg/arror1.png" style="width:32px;height:31px" class="aniMovelan5">
           <img src="@/assets/steamImg/arror1.png" style="width:32px;height:31px" class="aniMovelan5-2">
-          <p class="num2">{{ dashboarddata.steamHsinsub }}</p>
+          p class="num2">{{ dashboarddata.steamHsinsub }}</p>
+          <p class="num3">55</p>
         </div>
         <div class="jiantoulan pos-6">
           <img src="@/assets/steamImg/jiantoulan4.png" style="width:31px;height:150px">
@@ -340,6 +341,7 @@
         <div class="jiantoulan pos-10">
           <img src="@/assets/steamImg/jiantoulan7.png" style="width:30px;height:46px">
           <img src="@/assets/steamImg/arror1.png" style="width:32px;height:31px" class="aniMovelan10">
+          <p class="num2">0.37</p>
         </div>
         <div class="jiantoulan pos-11">
           <img src="@/assets/steamImg/jiantoulan2.png" style="width:31px;height:60px">
@@ -644,6 +646,12 @@
           left: 20px;
           color: #3659ab;
           position: absolute;
+        }
+        .num3{
+          top: 280px;
+          left: 70px;
+          color: #3659ab;
+          position: absolute;
         }
          .aniMovelan5{
             -webkit-animation-name:aniMovelan5;
@@ -820,6 +828,12 @@
       &.pos-10{
         top: 510px;
         left: 330px;
+         .num2{
+          top: 27px;
+          left: 20px;
+          color: #3659ab;
+          position: absolute;
+        }
          .aniMovelan10{
           -webkit-animation-name:aniMovelan10;
             animation-name:aniMovelan10;