fix：“优化苹果设备的机器排行和个人中心显示”

src/App.vue

@@ -104,7 +104,7 @@ html {
 body {
   height: 100%;
   // overflow-x: hidden;
-  // overflow-y: auto;
+  overflow: auto;
 }
 
 #app {

src/styles/home/index.less

@@ -148,8 +148,9 @@
             height: 30px;
 
             .word8 {
-              width: 14px;
+              width: auto;
               height: 20px;
+              padding-right: 21px;
               overflow-wrap: break-word;
               color: rgba(223, 94, 76, 1);
               font-size: 14px;
@@ -170,7 +171,7 @@
               text-align: center;
               white-space: nowrap;
               line-height: 30px;
-              margin-left: -1px;
+              margin-left: -20px;
               display: block;
             }
           }

src/styles/orderCenter/index.less

@@ -119,8 +119,9 @@
             height: 30px;
 
             .word8 {
-              width: 14px;
+              width: auto;
               height: 20px;
+              padding-right: 21px;
               overflow-wrap: break-word;
               color: rgba(223, 94, 76, 1);
               font-size: 14px;
@@ -142,7 +143,7 @@
               text-align: center;
               white-space: nowrap;
               line-height: 30px;
-              margin-left: -1px;
+              margin-left: -20px;
               display: block;
             }
           }

src/styles/robotRanking/index.less

@@ -107,13 +107,14 @@ button:active {
 .robotRanking {
     background-color: #fff;
     width: 100%;
-    height: calc(100vh - 100px);
-    // margin-bottom: 50px;
+    // height: calc(100vh - 100px);
     
     
     .box1 {
         height: 100%;
         width: 100%;
+        height: calc(100% - 50px);
+        padding-bottom: 10px;
         overflow: auto;
         overflow-x: hidden;
 

src/styles/user/index.less

@@ -2,7 +2,7 @@
     width: 100%;
     background: url(../../assets/user/bg.png) top center no-repeat;
     background-size: 100%;
-    height: calc(100vh - 50px);
+    // height: calc(100vh - 50px);
     // padding-bottom: 50px;
 
 
@@ -11,8 +11,10 @@
     }
 
     .userPageBox {
-        width: 100%;
         height: 100%;
+        width: 100%;
+        height: calc(100% - 50px);
+        padding-bottom: 10px;
         overflow: auto;
         overflow-x: hidden;
     }

src/views/robotRanking.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="robotRanking flex-col">
-    <s-header :name="$t('robotRanking.machineSalesRanking')" :noback="true"></s-header>
     <div class="box1 flex-col">
+      <s-header :name="$t('robotRanking.machineSalesRanking')" :noback="true" :isFixed="false"></s-header>
       <div class="box3 flex-col">
         <div class="main1 flex-col">
           <div class="mod1 flex-col">
@@ -887,6 +887,5 @@ export default {
 </script>
 
 <style lang="less" scoped>
-@import "../common/style/mixin";
 @import "../styles/robotRanking/index";
 </style>

src/views/user.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="userPage flex-col">
-    <s-header :name="sys ? sys.title : $t('user.personalCenter')" :noback="true" :isFixed="false"></s-header>
     <div class="userPageBox">
+      <s-header :name="sys ? sys.title : $t('user.personalCenter')" :noback="true" :isFixed="false"></s-header>
       <div class="userBaseBox">
         <div class="baseRow flex-row justify-between">
           <div class="group2 flex-col"></div>
@@ -25,7 +25,7 @@
         </div>
         <div class="userInfoBox">
           <!-- 地区 -->
-          <div v-if="isInland">
+          <div v-if="isInland && user.type != '0'">
             <div v-if="!areaShow" class="userInfo l-flex-between">
               <span class="userInfoLeft">{{ $t("user.region") }}: </span>
               <div class="cust_vantBorder">
@@ -53,43 +53,47 @@
             </div>
           </div>
           <!-- 手机号 -->
-          <div v-if="!phoneNumberShow" class="userInfo l-flex-between">
-            <span class="userInfoLeft">{{ $t("user.phoneNumber") }}: </span>
-            <div class="cust_vantBorder">
-              <van-field class="relationClass" v-model="cofficentForm.phone" :placeholder="$t('user.phoneNumberPlace')">
-                <template #button>
-                  <van-button type="primary" @click="mailboxChg(cofficentForm.phone, 3)">{{ $t("user.confirmLog") }}
-                  </van-button>
-                </template>
-              </van-field>
+          <div v-if="user.type != '0'">
+            <div v-if="!phoneNumberShow" class="userInfo l-flex-between">
+              <span class="userInfoLeft">{{ $t("user.phoneNumber") }}: </span>
+              <div class="cust_vantBorder">
+                <van-field class="relationClass" v-model="cofficentForm.phone" :placeholder="$t('user.phoneNumberPlace')">
+                  <template #button>
+                    <van-button type="primary" @click="mailboxChg(cofficentForm.phone, 3)">{{ $t("user.confirmLog") }}
+                    </van-button>
+                  </template>
+                </van-field>
+              </div>
+              <van-icon name="edit" class="editIcon" @click="editClk(3)" />
+            </div>
+            <div v-else class="userInfo l-flex-between">
+              <span class="userInfoLeft">{{ $t("user.phoneNumber") }}: </span>
+              <span>{{ accountDetail.phone }}</span>
+              <van-icon name="edit" class="editIcon" @click="editClk(3)" />
             </div>
-            <van-icon name="edit" class="editIcon" @click="editClk(3)" />
-          </div>
-          <div v-else class="userInfo l-flex-between">
-            <span class="userInfoLeft">{{ $t("user.phoneNumber") }}: </span>
-            <span>{{ accountDetail.phone }}</span>
-            <van-icon name="edit" class="editIcon" @click="editClk(3)" />
           </div>
           <!-- 邮箱 -->
-          <div v-if="!mailboxShow" class="userInfo l-flex-between">
-            <span class="userInfoLeft">{{ $t("user.mailbox") }}: </span>
-            <div class="cust_vantBorder">
-              <van-field class="relationClass" v-model="cofficentForm.mailBox" :placeholder="$t('user.mailboxPlace')">
-                <template #button>
-                  <van-button type="primary" @click="mailboxChg(cofficentForm.mailBox, 2)">{{ $t("user.confirmLog") }}
-                  </van-button>
-                </template>
-              </van-field>
+          <div v-if="user.type != '0'">
+            <div v-if="!mailboxShow" class="userInfo l-flex-between">
+              <span class="userInfoLeft">{{ $t("user.mailbox") }}: </span>
+              <div class="cust_vantBorder">
+                <van-field class="relationClass" v-model="cofficentForm.mailBox" :placeholder="$t('user.mailboxPlace')">
+                  <template #button>
+                    <van-button type="primary" @click="mailboxChg(cofficentForm.mailBox, 2)">{{ $t("user.confirmLog") }}
+                    </van-button>
+                  </template>
+                </van-field>
+              </div>
+              <van-icon name="edit" class="editIcon" @click="editClk(2)" />
+            </div>
+            <div v-else class="userInfo l-flex-between">
+              <span class="userInfoLeft">{{ $t("user.mailbox") }}: </span>
+              <span>{{ accountDetail.email }}</span>
+              <van-icon name="edit" class="editIcon" @click="editClk(2)" />
             </div>
-            <van-icon name="edit" class="editIcon" @click="editClk(2)" />
-          </div>
-          <div v-else class="userInfo l-flex-between">
-            <span class="userInfoLeft">{{ $t("user.mailbox") }}: </span>
-            <span>{{ accountDetail.email }}</span>
-            <van-icon name="edit" class="editIcon" @click="editClk(2)" />
           </div>
           <!-- 关联上级 -->
-          <div v-if="isInland">
+          <div v-if="isInland && user.type == '2'">
             <div v-if="!relationType" class="userInfo l-flex-between">
               <span class="userInfoLeft">{{ $t("user.associateParent") }}: </span>
               <div class="cust_vantBorder">
@@ -223,7 +227,7 @@
 
           <!-- 定位修改 -->
           <div v-if="user.type == '0'" class="taskListRow flex-col" @click="pushPageList('/modifyLoc')">
-          <!-- <div class="taskListRow flex-col" @click="pushPageList('/modifyLoc')"> -->
+            <!-- <div class="taskListRow flex-col" @click="pushPageList('/modifyLoc')"> -->
             <div class="taskIcon modifyLocIcon"></div>
             <div class="taskRight">
               <div class="taskTitle">
@@ -234,7 +238,7 @@
 
           <!-- 数据同步 -->
           <div v-if="user.type == '0'" class="taskListRow flex-col" @click="pushPageList('/syncOldData')">
-          <!-- <div class="taskListRow flex-col" @click="pushPageList('/syncOldData')"> -->
+            <!-- <div class="taskListRow flex-col" @click="pushPageList('/syncOldData')"> -->
             <div class="taskIcon syncOldDataIcon"></div>
             <div class="taskRight">
               <div class="taskTitle">
@@ -589,12 +593,12 @@ export default {
       gettAdminGetRelation();
       // 获取账户
       getAcccountDetail();
-      if (user.id == 1 ) {
+      if (user.id == 1) {
         chaSzPayShow.value = true;
         chaScPayShow.value = true;
         getSunzeeDetail();
         getSevenCloudDetail();
-      } 
+      }
       // else if (user.id == 2738) {
       //   chaSzPayShow.value = true;
       //   getSunzeeDetail();