Browse Source

fix:“优化机器排行和苹果设备显示”

soobin 1 năm trước cách đây
mục cha
commit
0f0a682f8b

+ 2 - 2
src/common/style/mixin.less

@@ -23,10 +23,10 @@
 
 // //1px底部边框
 .border-1px(@color){
-  position: relative;
+  position: fixed;
   &:after{
     display: block;
-    position: absolute;
+    position: fixed;
     left: 0;
     bottom: 0;
     width: 100%;

+ 6 - 6
src/styles/robotRanking/index.less

@@ -106,16 +106,16 @@ button:active {
 
 .robotRanking {
     background-color: #fff;
-    // position: relative;
     width: 100%;
-    height: calc(100%-50px);
-    padding-bottom: 60px;
-    overflow: auto;
-    overflow-x: hidden;
-
+    height: calc(100vh - 100px);
+    // margin-bottom: 50px;
+    
+    
     .box1 {
         height: 100%;
         width: 100%;
+        overflow: auto;
+        overflow-x: hidden;
 
         .van-tabs__line {
             background-color: #4d6add !important;

+ 6 - 7
src/styles/user/index.less

@@ -2,10 +2,9 @@
     width: 100%;
     background: url(../../assets/user/bg.png) top center no-repeat;
     background-size: 100%;
-    // position: relative;
-    height: calc(100% - 50px);
-    overflow: auto;
-    overflow-x: hidden;
+    height: calc(100vh - 50px);
+    // padding-bottom: 50px;
+
 
     .simple-header {
         background: transparent;
@@ -14,8 +13,8 @@
     .userPageBox {
         width: 100%;
         height: 100%;
-        // margin-bottom: 100px;
-
+        overflow: auto;
+        overflow-x: hidden;
     }
 
     .userBaseBox {
@@ -75,7 +74,7 @@
     }
 
     .userInfoBox {
-        margin-top: 25px;
+        // margin-top: 25px;
         padding: 0px 15px 20px;
 
         .userInfo {

+ 6 - 3
src/views/robotRanking.vue

@@ -694,9 +694,9 @@ export default {
               },
             ];
             dayChartOption.dataZoom[0]["startValue"] =
-              data.data.categories[data.data.categories.length - 5];
+              data.data.categories[0];
             dayChartOption.dataZoom[0]["endValue"] =
-              data.data.categories[data.data.categories.length - 1];
+              data.data.categories[4];
             // 解决resize不起作用,配合onMounted里的方法使用
             switch (chartType) {
               case "day":
@@ -886,4 +886,7 @@ export default {
 };
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+@import "../common/style/mixin";
+@import "../styles/robotRanking/index";
+</style>

+ 2 - 1
src/views/user.vue

@@ -169,7 +169,7 @@
           </div>
 
           <!-- 提现帐号 -->
-          <div v-if="isInland" class="taskListRow flex-col" @click="pushPageList('/settlement')">
+          <div v-if="isInland && user.type != '0'" class="taskListRow flex-col" @click="pushPageList('/settlement')">
             <div class="taskIcon joinPayMchIcon"></div>
             <div class="taskRight">
               <div class="taskTitle">{{ $t("user.settlementAccount") }}</div>
@@ -743,4 +743,5 @@ export default {
 
 <style lang="less" scoped>
 @import "../common/style/mixin";
+@import "../styles/user/index";
 </style>