From 65a67551127e33ac48b6b10ba4054a68552e7152 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?TOP=E7=B3=AF=E7=B1=B3?= <1130395124@qq.com>
Date: Sat, 1 Apr 2023 16:09:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=95=E9=83=A8=E8=82=A1?=
 =?UTF-8?q?=E4=B8=9C=E6=8C=89=E9=92=AE=E7=9A=84=E6=A0=B7=E5=BC=8F=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                | 4 ++--
 src/pages/get/detail.vue   | 2 +-
 src/pages/get/index.vue    | 7 +++++--
 src/pages/order/detail.vue | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index e1bfd1d..170938c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -168,10 +168,10 @@ export default {
     right: 0;
     bottom: 0;
     max-width: 750px;
-    width: 100%;
+    // width: 100%;
     height: 100rpx;
     margin: 0 auto;
-    box-sizing: border-box;
+    // box-sizing: border-box;
     padding: 0 40rpx;
     display: flex;
     align-items: center;
diff --git a/src/pages/get/detail.vue b/src/pages/get/detail.vue
index 8bd65f1..3728ce7 100644
--- a/src/pages/get/detail.vue
+++ b/src/pages/get/detail.vue
@@ -113,7 +113,7 @@
                 </view>
             </block>
         </view>
-        <view class="common-bottom-components" :style="{ bottom: pageConfig.safeAreaInsets.bottom + 'px' }">
+        <view class="common-bottom-components" :style="{ paddingBottom: pageConfig.safeAreaInsets.bottom + 'px' }">
             <view class="service" @click="showService = true">
                 <text class="iconfont icon-kefu"></text>
                 <text class="text">客服</text>
diff --git a/src/pages/get/index.vue b/src/pages/get/index.vue
index 804ee58..51ce73c 100644
--- a/src/pages/get/index.vue
+++ b/src/pages/get/index.vue
@@ -54,7 +54,7 @@
                 </swiper>
             </view>
         </view>
-        <view class="common-bottom-components">
+        <view class="common-bottom-components" :style="{ paddingBottom: pageConfig.safeAreaInsets.bottom + 'px' }">
             <view class="setting-btn" @click="setting">
                 <text class="iconfont icon-shezhi"></text>
                 <text class="text">接单设置</text>
@@ -80,6 +80,7 @@ export default {
     data() {
         return {
             utils: this.$utils,
+            pageConfig: {},
             showPriceModal: false,
             safePt: 0,
             tabIndex: 0,
@@ -122,7 +123,9 @@ export default {
             getTabIndex: (state) => state.system.getTabIndex,
         }),
     },
-    onLoad() {},
+    onLoad() {
+        this.pageConfig = getApp().globalData.pageConfig;
+    },
     onShow() {
         if (this.getTabIndex != this.tabIndex) {
             this.tabIndex = this.getTabIndex;
diff --git a/src/pages/order/detail.vue b/src/pages/order/detail.vue
index 7d084a3..50cd4a3 100644
--- a/src/pages/order/detail.vue
+++ b/src/pages/order/detail.vue
@@ -112,7 +112,7 @@
                 <text class="price-box">¥ {{ utils.formatNumber(order.price, 2) }}</text>
             </view>
         </view>
-        <view class="common-bottom-components" :style="{ bottom: pageConfig.safeAreaInsets.bottom + 'px' }">
+        <view class="common-bottom-components" :style="{ paddingBottom: pageConfig.safeAreaInsets.bottom + 'px' }">
             <view class="service" @click="showService = true">
                 <text class="iconfont icon-kefu"></text>
                 <text class="text">客服</text>