fix:滚动

src/pages-charge/appointment/appointment.vue

@@ -1,8 +1,9 @@
 <template>
-  <view
-    :class="['page', chargeTimeDialog || priceDescVisible ? 'page-hidden' : '']"
-  >
-    <template v-if="data && priceInfo">
+  <!--  #ifdef MP-WEIXIN -->
+  <page-meta page-style="overflow: {{N || H ? 'hidden' : 'visible'}}" />
+  <!--  #endif -->
+  <view :class="['page']">
+    <view v-if="data && priceInfo">
       <view class="block">
         <view class="station">
           <ChargeMachine
@@ -159,7 +160,7 @@
           }}</style-button>
         </view>
       </style-bottom-view>
-    </template>
+    </view>
     <style-dialog
       v-if="chargeTimeDialog"
       @close="closeTime"
@@ -704,10 +705,6 @@ onLoad((_options: any) => {
   padding: 20rpx;
   background-color: #f6f7fa;
 }
-.page-hidden {
-  height: 100vh;
-  overflow: hidden;
-}
 .block {
   border-radius: 20rpx;
   background: #fff;

src/pages-charge/machines/machines.vue

@@ -1,8 +1,8 @@
 <template>
-  <view
-    :class="['pb-40', `container-${dialogVisible ? 'hidden' : ''}`]"
-    v-if="station"
-  >
+  <!--  #ifdef MP-WEIXIN -->
+  <page-meta page-style="overflow: {{y ? 'hidden' : 'visible'}}" />
+  <!--  #endif -->
+  <view :class="['pb-40']" v-if="station">
     <view class="banner">
       <swiper
         class="full-percent"
@@ -70,7 +70,9 @@
         <view class="flex-align-center">
           <view class="width-168 fs-26 color-666">停车费用</view>
           <view class="fs-26 color-000">{{
-            Number(station.parkFee) > 0 ? station.parkFee : "以停车场公示信息为准"
+            Number(station.parkFee) > 0
+              ? station.parkFee
+              : "以停车场公示信息为准"
           }}</view>
         </view>
         <view
@@ -345,12 +347,6 @@ page {
   background-color: #f5f5f5;
 }
 
-.container-hidden {
-  width: 100%;
-  height: 100vh;
-  overflow: hidden;
-}
-
 .banner {
   height: 440rpx;
   background-color: transparent;

src/pages/map/map.vue

@@ -6,7 +6,7 @@
         <view class="dialog_logo ml-24"></view>
         <view class="dialog_search ml-24" @click.stop="toSearch"></view>
       </view>
-      <view class="height-72 flex" style="background-color: #f9f9f9">
+      <!-- <view class="height-72 flex" style="background-color: #f9f9f9">
         <view class="width-half flex-center" @click.stop="checkFilterDistance">
           <view class="fs-26 color-000-6 mr-8">距离</view>
           <view
@@ -23,7 +23,7 @@
           </view>
         </view>
         <view class="width-half flex-center">
-          <!-- <view
+          <view
             class="width-32 height-32 br-round lh-20 text-center"
             :style="{
               border: filterDialog.discounts
@@ -47,9 +47,9 @@
               filterDialog.discounts ? 'color-primary' : 'color-000-6',
             ]"
             >支持省钱充电</view
-          > -->
+          >
         </view>
-      </view>
+      </view> -->
       <view
         class="dialog_selector"
         :style="{
@@ -510,7 +510,7 @@ const refresh = () => {
 const handleNavReady = (e: any) => {
   styleData.value.dialog = `padding-top:${e.detail.statusBarHeight - 6}px;`;
   const searchHeight = rpxToPx(88);
-  const filterHeight = rpxToPx(72);
+  const filterHeight = 0 // rpxToPx(72);
   styleData.value.dialogHeight =
     e.detail.statusBarHeight - 6 + searchHeight + filterHeight;
   styleData.value.dialogPlaceHolderHeight =
@@ -590,7 +590,7 @@ onShow(() => {
   if (token.value) {
     setTimeout(() => {
       fetchCharging();
-    }, 3000);
+    }, 2000);
   }
 });
 
@@ -599,6 +599,9 @@ const fetchCharging = () => {
     if (res && [1, 2].includes(res.chargeStatus)) {
       charging.value = res;
     }
+    if (res && res.isBooking) {
+      charging.value = res;
+    }
   });
 };
 
@@ -928,7 +931,7 @@ page {
 
 .charging {
   position: fixed;
-  z-index: 999;
+  z-index: 1000;
   right: 0;
   bottom: 164rpx;
   width: 186rpx;

src/pages/user/user.vue

@@ -21,7 +21,7 @@
               'background-image': `url(${user.avatar})`,
             }"
           ></view>
-          <view class="phone fs-40 fw-500">{{ user.mobilePhone }}</view>
+          <view class="phone fs-40 fw-500">{{ user.mobilePhoneFormat }}</view>
           <view class="money flex-align-center" @click="toPage(-1)">
             <uni-icons
               type="wallet-filled"
@@ -40,22 +40,25 @@
       </view>
 
       <view class="body">
-        <view
-          class="menu flex-align-center"
-          v-for="(item, index) in menu"
-          :key="index"
-          @click="toPage(index)"
-        >
-          <image src="/static/images/user/{{index + 1}}.png"></image>
-          <view>{{ item.title }}</view>
-          <view class="ml-auto">
-            <uni-icons
-              type="right"
-              size="12"
-              color="rgba(0,0,0,0.4)"
-            ></uni-icons>
+        <block v-for="(item, index) in menu" :key="index">
+          <view
+            class="menu flex-align-center"
+            v-if="
+              index !== menu.length - 1 || user.mobilePhone === '15986907592'
+            "
+            @click="toPage(index)"
+          >
+            <image src="/static/images/user/{{index + 1}}.png"></image>
+            <view>{{ item.title }}</view>
+            <view class="ml-auto">
+              <uni-icons
+                type="right"
+                size="12"
+                color="rgba(0,0,0,0.4)"
+              ></uni-icons>
+            </view>
           </view>
-        </view>
+        </block>
       </view>
     </view>
   </block>
@@ -92,13 +95,17 @@ const menu = ref([
     title: "常见问题",
     path: "/pages-common/contact/contact",
   },
+  {
+    title: "电站列表",
+    path: "/pages/list/list",
+  },
 ]);
 const toPage = (index: number) => {
   if (index < 0) {
     uni.navigateTo({
       url: "/pages-user/wallet/wallet",
     });
-    return
+    return;
   }
   if (index === 3) {
     uni.makePhoneCall({
@@ -125,7 +132,7 @@ onLoad(() => {
 });
 onShow(() => {
   fetchProfile().then((res) => {
-    res.mobilePhone =
+    res.mobilePhoneFormat =
       res.mobilePhone.slice(0, 3) + "****" + res.mobilePhone.slice(7);
     res.avatar = res.avatar
       ? res.avatar