diff --git a/common/css/page.css b/common/css/page.css
index 9f648e6c..b7c8e30d 100644
--- a/common/css/page.css
+++ b/common/css/page.css
@@ -246,7 +246,7 @@ button:before {
  * 页面底部浮动、增加底部边距
  */
 .page-bottom-fixed {
-    padding-bottom: 120rpx;
+    padding-bottom: 120rpx !important;
 }
 
 /**
@@ -464,6 +464,13 @@ button[disabled].bg-yellow {
 button[disabled].bg-gray {
     background-color: #ececec !important;
     color: #ababab !important;
+}
+
+/**
+ * 兼容底部横线底部内边距
+ */
+.bottom-line-exclude {
+	padding-bottom: calc(env(safe-area-inset-bottom) - 40rpx);
 }
 
 /**
diff --git a/components/popup/popup.vue b/components/popup/popup.vue
index 55fd3916..f86d1a36 100644
--- a/components/popup/popup.vue
+++ b/components/popup/popup.vue
@@ -2,7 +2,7 @@
     <view>
         <view :class="'popup ' + (propClassname || '') + ' ' + ((propShow || false) ? 'popup-show' : '') + ' ' + ((propAnimation || true) ? 'animation': '' )" :disable-scroll="propDisablescroll">
             <view class="popup-mask" v-if="propMask || true" @tap="onMaskTap"></view>
-            <view :class="'popup-content popup-' + (propPosition || 'bottom')+ ' '+(propIsBar ? 'popup-bar' : '')">
+            <view :class="'popup-content bottom-line-exclude popup-' + (propPosition || 'bottom')+ ' '+(propIsBar ? 'popup-bar' : '')">
                 <slot></slot>
             </view>
         </view>
diff --git a/pages/buy/buy.vue b/pages/buy/buy.vue
index 1bae8692..8b79010b 100644
--- a/pages/buy/buy.vue
+++ b/pages/buy/buy.vue
@@ -155,7 +155,7 @@
                 </view>
 
                 <!-- 导航 -->
-                <view class="buy-nav oh wh-auto bg-white br-t">
+                <view class="buy-nav oh wh-auto bg-white br-t bottom-line-exclude">
                     <view class="nav-base fl single-text padding-left-main">
                         <text>合计：</text>
                         <text class="sales-price">{{currency_symbol}}{{total_price}}</text>
diff --git a/pages/goods-detail/goods-detail.css b/pages/goods-detail/goods-detail.css
index daca311b..0aab7ad2 100644
--- a/pages/goods-detail/goods-detail.css
+++ b/pages/goods-detail/goods-detail.css
@@ -108,8 +108,7 @@
     left: 0;
     bottom: 0;
     height: 100rpx;
-    z-index: 2;
-	padding-bottom: calc(env(safe-area-inset-bottom) - 40rpx);
+    z-index: 2;
 }
 .goods-buy-nav .bus-items {
     width: 45%;
diff --git a/pages/goods-detail/goods-detail.vue b/pages/goods-detail/goods-detail.vue
index 12b506e6..6e6ae6e0 100644
--- a/pages/goods-detail/goods-detail.vue
+++ b/pages/goods-detail/goods-detail.vue
@@ -328,7 +328,7 @@
             <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
 
             <!-- 底部操作 -->
-            <view class="goods-buy-nav oh wh-auto bg-white br-t">
+            <view class="goods-buy-nav oh wh-auto bg-white br-t bottom-line-exclude">
                 <!-- 左侧集合操作 -->
                 <view :class="'bus-items fl tc bus-items-'+bottom_nav_bus_number">
                     <!-- 是否指定返回操作、返回操作情况下仅展示返回和收藏操作 -->
diff --git a/pages/plugins/membershiplevelvip/member-code/member-code.css b/pages/plugins/membershiplevelvip/member-code/member-code.css
index 419dfc7b..a0515085 100644
--- a/pages/plugins/membershiplevelvip/member-code/member-code.css
+++ b/pages/plugins/membershiplevelvip/member-code/member-code.css
@@ -7,9 +7,6 @@
     margin-top: 60rpx;
     padding: 50rpx;
 }
-.bottom-fixed {
-	padding-bottom: calc(20rpx + env(safe-area-inset-bottom));
-}
 .bottom-fixed button {
     width: 50%;
 }
\ No newline at end of file
diff --git a/pages/plugins/membershiplevelvip/member-code/member-code.vue b/pages/plugins/membershiplevelvip/member-code/member-code.vue
index d340b0b7..82934351 100644
--- a/pages/plugins/membershiplevelvip/member-code/member-code.vue
+++ b/pages/plugins/membershiplevelvip/member-code/member-code.vue
@@ -18,10 +18,12 @@
             
             <!-- 导航 -->
             <view v-if="(plugins_wallet || null) != null" class="bottom-fixed padding-main">
-                <view class="bg-gray round oh">
-                    <button type="default" class="bg-main br-main cr-white round text-size fl" size="mini">会员码</button>
-                    <button type="default" class="bg-gray br-gray cr-base round text-size fr" size="mini" :data-value="'/pages/plugins/wallet/payment-code/payment-code?screen_brightness_value='+screen_brightness_value" data-redirect="1" @tap="url_event">钱包付款码</button>
-                </view>
+				<view class="bottom-line-exclude oh">
+					<view class="bg-gray round oh">
+						<button type="default" class="bg-main br-main cr-white round text-size fl" size="mini">会员码</button>
+						<button type="default" class="bg-gray br-gray cr-base round text-size fr" size="mini" :data-value="'/pages/plugins/wallet/payment-code/payment-code?screen_brightness_value='+screen_brightness_value" data-redirect="1" @tap="url_event">钱包付款码</button>
+					</view>
+				</view>
             </view>
         </block>
 
@@ -176,6 +178,6 @@
         }
     }
 </script>
-<style>
-    @import './member-code.css';
+<style>
+    @import './member-code.css';
 </style>
\ No newline at end of file
diff --git a/pages/plugins/wallet/payment-code/payment-code.css b/pages/plugins/wallet/payment-code/payment-code.css
index 419dfc7b..a0515085 100644
--- a/pages/plugins/wallet/payment-code/payment-code.css
+++ b/pages/plugins/wallet/payment-code/payment-code.css
@@ -7,9 +7,6 @@
     margin-top: 60rpx;
     padding: 50rpx;
 }
-.bottom-fixed {
-	padding-bottom: calc(20rpx + env(safe-area-inset-bottom));
-}
 .bottom-fixed button {
     width: 50%;
 }
\ No newline at end of file
diff --git a/pages/plugins/wallet/payment-code/payment-code.vue b/pages/plugins/wallet/payment-code/payment-code.vue
index 3ba674f9..49fcc88c 100644
--- a/pages/plugins/wallet/payment-code/payment-code.vue
+++ b/pages/plugins/wallet/payment-code/payment-code.vue
@@ -21,10 +21,12 @@
 
             <!-- 导航 -->
             <view v-if="(plugins_membershiplevelvip || null) != null" class="bottom-fixed padding-main">
-                <view class="bg-gray round oh">
-                    <button type="default" class="bg-gray br-gray cr-base round text-size fl" size="mini" :data-value="'/pages/plugins/membershiplevelvip/member-code/member-code?screen_brightness_value='+screen_brightness_value" data-redirect="1" @tap="url_event">会员码</button>
-                    <button type="default" class="bg-main br-main cr-white round text-size fr" size="mini">钱包付款码</button>
-                </view>
+				<view class="bottom-line-exclude oh">
+					<view class="bg-gray round oh">
+						<button type="default" class="bg-gray br-gray cr-base round text-size fl" size="mini" :data-value="'/pages/plugins/membershiplevelvip/member-code/member-code?screen_brightness_value='+screen_brightness_value" data-redirect="1" @tap="url_event">会员码</button>
+						<button type="default" class="bg-main br-main cr-white round text-size fr" size="mini">钱包付款码</button>
+					</view>
+				</view>
             </view>
         </block>
 
diff --git a/pages/plugins/weixinliveplayer/detail/detail.css b/pages/plugins/weixinliveplayer/detail/detail.css
index fa0c022a..16e010dd 100644
--- a/pages/plugins/weixinliveplayer/detail/detail.css
+++ b/pages/plugins/weixinliveplayer/detail/detail.css
@@ -25,8 +25,7 @@
     position: fixed;
     left: 0;
     bottom: 20rpx;
-    height: 80rpx;
-	padding-bottom: calc(env(safe-area-inset-bottom) - 40rpx);
+    height: 80rpx;
 }
 .nav button {
     height: 100% !important;
diff --git a/pages/plugins/weixinliveplayer/detail/detail.vue b/pages/plugins/weixinliveplayer/detail/detail.vue
index fdc5ef0d..36282b6e 100644
--- a/pages/plugins/weixinliveplayer/detail/detail.vue
+++ b/pages/plugins/weixinliveplayer/detail/detail.vue
@@ -29,7 +29,7 @@
             </view>
 
             <!-- 导航 -->
-            <view class="nav wh-auto oh">
+            <view class="nav wh-auto oh bottom-line-exclude">
                 <button class="share-friend-submit fl cr-white text-size round margin-left-main" type="default" hover-class="none" open-type="share">
                     <image class="item-icon va-m margin-right-sm" :src="static_url+'nav-share-friend-icon.png'" mode="widthFix"></image>
                     <text class="va-m">分享</text>
diff --git a/pages/user-address-save/user-address-save.css b/pages/user-address-save/user-address-save.css
index d27ab9e6..41bafac2 100644
--- a/pages/user-address-save/user-address-save.css
+++ b/pages/user-address-save/user-address-save.css
@@ -61,10 +61,21 @@
     width: 300rpx;
 }
 .code-search input {
-    width: calc(100% - 122rpx);
+    width: calc(100% - 100rpx) !important;
+	border-top-left-radius: 50rpx !important;
+	border-bottom-left-radius: 50rpx !important;
 }
 .code-search input,
 .code-search button {
-    height: 40rpx;
-    line-height: 40rpx;
+    height: 50rpx !important;
+	min-height: 50rpx !important;
+	line-height: 48rpx !important;
+}
+.code-search button {
+	top: 0;
+	right: 0;
+	border-top-left-radius: 0 !important;
+	border-bottom-left-radius: 0 !important;
+	border-top-right-radius: 50rpx !important;
+	border-bottom-right-radius: 50rpx !important;
 }
\ No newline at end of file
diff --git a/pages/user-address-save/user-address-save.vue b/pages/user-address-save/user-address-save.vue
index b236bde3..6654770c 100644
--- a/pages/user-address-save/user-address-save.vue
+++ b/pages/user-address-save/user-address-save.vue
@@ -16,13 +16,13 @@
                 <view class="form-gorup">
                     <block v-if="is_user_address_forbid_choice_region == 0">
                         <view class="br-b padding-bottom-xs margin-bottom-lg">
-                            <view class="form-gorup-title oh">
-                                <text>省市区</text>
-                                <text class="form-group-tips-must">*</text>
-                                <view class="code-search fr">
-                                    <input type="text" maxlength="30" placeholder-class="cr-grey" class="cr-base dis-inline-block br radius text-size-xs padding-left-sm padding-right-sm" placeholder="地址编号" @input="region_code_value_event">
-                                    <button type="default" size="mini" class="bg-main-pair br-main-pair cr-white text-size-xs margin-left-sm" @tap="region_code_event" :disabled="form_submit_disabled_status">检索</button>
-                                </view>
+                            <view class="form-gorup-title oh">
+                                <text>省市区</text>
+                                <text class="form-group-tips-must">*</text>
+                                <view class="code-search fr oh pr">
+                                    <input type="text" maxlength="30" placeholder-class="cr-grey" class="cr-base dis-inline-block br-main-pair text-size-xs padding-left-sm padding-right-sm va-m" placeholder="地址编号" @input="region_code_value_event">
+                                    <button type="default" size="mini" class="bg-main-pair br-main-pair cr-white text-size-xs pa" @tap="region_code_event" :disabled="form_submit_disabled_status">检索</button>
+                                </view>
                             </view>
                             <view class="select-address oh">
                                 <view class="section fl">
@@ -101,7 +101,9 @@
                 </view>
 
                 <view class="bottom-fixed padding-main">
-                    <button class="bg-main br-main cr-white round text-size" type="default" form-type="submit" hover-class="none" :disabled="form_submit_disabled_status">保存</button>
+					<view class="bottom-line-exclude oh">
+						<button class="bg-main br-main cr-white round text-size" type="default" form-type="submit" hover-class="none" :disabled="form_submit_disabled_status">保存</button>
+					</view>
                 </view>
             </view>
         </form>
@@ -136,7 +138,7 @@
                 user_location_cache_key: app.globalData.data.cache_userlocation_key,
                 user_location: null,
                 address_discern_value: '',
-                form_submit_disabled_status: false,
+                form_submit_disabled_status: false,
                 region_code_value: '',
                 // 基础配置
                 home_user_address_map_status: 0,
@@ -756,57 +758,57 @@
                         }
                     });
                 }
-            },
-            
-            // 地址编号输入事件
-            region_code_value_event(e) {
-                this.setData({
-                    region_code_value: e.detail.value
-                });
-            },
-            // 地址编号搜索
-            region_code_event(e) {
-                if((this.region_code_value || null) == null) {
-                    app.globalData.showToast('请输入数据');
-                    return false;
-                }
-                this.setData({
-                    form_submit_disabled_status: true
-                });
-                uni.request({
-                    url: app.globalData.get_request_url('codedata', 'region'),
-                    method: 'POST',
-                    data: {code: this.region_code_value},
-                    dataType: 'json',
-                    success: res => {
-                        this.setData({
-                            form_submit_disabled_status: false
-                        });
-                        if (res.data.code == 0) {
-                            app.globalData.showToast(res.data.msg, 'success');
-                            var ads_data = res.data.data;
-                            this.setData({
-                                province_id: ads_data.province || null,
-                                city_id: ads_data.city || null,
-                                county_id: ads_data.county || null
-                            });
-                            // 地区数据填充处理
-                            this.region_data_fill_handle();
-                        } else {
-                            if (app.globalData.is_login_check(res.data)) {
-                                app.globalData.showToast(res.data.msg);
-                            } else {
-                                app.globalData.showToast('提交失败，请重试！');
-                            }
-                        }
-                    },
-                    fail: () => {
-                        this.setData({
-                            form_submit_disabled_status: false
-                        });
-                        app.globalData.showToast('服务器请求出错');
-                    }
-                });
+            },
+            
+            // 地址编号输入事件
+            region_code_value_event(e) {
+                this.setData({
+                    region_code_value: e.detail.value
+                });
+            },
+            // 地址编号搜索
+            region_code_event(e) {
+                if((this.region_code_value || null) == null) {
+                    app.globalData.showToast('请输入数据');
+                    return false;
+                }
+                this.setData({
+                    form_submit_disabled_status: true
+                });
+                uni.request({
+                    url: app.globalData.get_request_url('codedata', 'region'),
+                    method: 'POST',
+                    data: {code: this.region_code_value},
+                    dataType: 'json',
+                    success: res => {
+                        this.setData({
+                            form_submit_disabled_status: false
+                        });
+                        if (res.data.code == 0) {
+                            app.globalData.showToast(res.data.msg, 'success');
+                            var ads_data = res.data.data;
+                            this.setData({
+                                province_id: ads_data.province || null,
+                                city_id: ads_data.city || null,
+                                county_id: ads_data.county || null
+                            });
+                            // 地区数据填充处理
+                            this.region_data_fill_handle();
+                        } else {
+                            if (app.globalData.is_login_check(res.data)) {
+                                app.globalData.showToast(res.data.msg);
+                            } else {
+                                app.globalData.showToast('提交失败，请重试！');
+                            }
+                        }
+                    },
+                    fail: () => {
+                        this.setData({
+                            form_submit_disabled_status: false
+                        });
+                        app.globalData.showToast('服务器请求出错');
+                    }
+                });
             }
         }
     };
diff --git a/pages/user-address/user-address.vue b/pages/user-address/user-address.vue
index ad1c636d..fb2723f3 100644
--- a/pages/user-address/user-address.vue
+++ b/pages/user-address/user-address.vue
@@ -41,15 +41,17 @@
 
         <!-- 底部操作 -->
         <view class="bottom-fixed padding-main">
-            <block v-if="common_user_address_platform_import_list.length > 0 && common_user_address_platform_import_list.indexOf(client_value) != -1">
-                <view class="submit-list">
-                    <button class="bg-main br-main cr-white round text-size dis-inline-block fl" type="default" hover-class="none" @tap="address_add_event">添加新地址</button>
-                    <button class="bg-main-pair br-main-pair cr-white round text-size dis-inline-block fr" type="default" hover-class="none" @tap="choose_system_address_event">导入系统地址</button>
-                </view>
-            </block>
-            <block v-else>
-                <button class="bg-main br-main cr-white round text-size wh-auto" type="default" hover-class="none" @tap="address_add_event">添加新地址</button>
-            </block>
+			<view class="bottom-line-exclude oh">
+				<block v-if="common_user_address_platform_import_list.length > 0 && common_user_address_platform_import_list.indexOf(client_value) != -1">
+					<view class="submit-list">
+						<button class="bg-main br-main cr-white round text-size dis-inline-block fl" type="default" hover-class="none" @tap="address_add_event">添加新地址</button>
+						<button class="bg-main-pair br-main-pair cr-white round text-size dis-inline-block fr" type="default" hover-class="none" @tap="choose_system_address_event">导入系统地址</button>
+					</view>
+				</block>
+				<block v-else>
+					<button class="bg-main br-main cr-white round text-size wh-auto" type="default" hover-class="none" @tap="address_add_event">添加新地址</button>
+				</block>
+			</view>
         </view>
     </view>
 </template>