From 9fbb8e9faf2388172359f4c84f5a2000fe65cd8b Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Wed, 1 Dec 2021 01:42:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B9H5+=E7=BB=86=E8=8A=82?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/css/page.css                          | 48 +++++++++--
 components/online-service/online-service.vue | 12 +--
 components/popup/popup.vue                   | 43 +++++++--
 components/quick-nav/quick-nav.vue           | 16 ++--
 pages/cart/cart.css                          |  9 +-
 pages/cart/cart.vue                          | 91 ++++++++++----------
 pages/login/login.css                        |  4 +-
 pages/login/login.vue                        | 62 +++++++------
 pages/plugins/activity/index/index.vue       | 11 +--
 pages/plugins/label/detail/detail.css        | 23 ++---
 pages/user/user.css                          | 21 +++--
 pages/user/user.vue                          |  4 +-
 12 files changed, 206 insertions(+), 138 deletions(-)

diff --git a/common/css/page.css b/common/css/page.css
index 072df838..30050fc0 100644
--- a/common/css/page.css
+++ b/common/css/page.css
@@ -4,7 +4,10 @@ body {
 }
 page {
     min-height: 100%;
-}
+}
+/**
+ * 页面宽度最大800px、并居中
+ */
 page,
 iframe,
 .uni-page-head,
@@ -18,7 +21,8 @@ iframe,
 .popup-top,
 .quick-movable-container,
 .online-service-movable-container,
-.bottom-fixed {
+.bottom-fixed,
+.buy-nav {
     max-width: 800px !important;
     margin: 0 auto !important;
 }
@@ -26,12 +30,44 @@ iframe,
 .goods-buy-nav,
 .nav-more-view,
 .quick-movable-container,
-.online-service-movable-container {
+.online-service-movable-container,
+.buy-nav {
     left: auto !important;
 }
 iframe,
 .bottom-fixed {
     right: 0 !important;
+}
+/**
+ * 隐藏导航栏内容、仅展示返回按钮
+ */
+uni-page-head {
+    position: absolute;
+    margin-top: -999999px;
+    z-index: 99;
+}
+.uni-page-head-bd {
+    display: none !important;
+}
+.uni-page-head-btn {
+    position: fixed;
+    left: auto;
+    bottom: 60px;
+    background: rgba(0, 0, 0, 0.6);
+    box-shadow: 0 0 10px rgb(0 0 0 / 30%);
+    margin: 0 0 0 10px;
+    border-radius: 50px;
+    width: 31px;
+    height: 31px;
+    text-align: center;
+    padding: 2px 3px 0 0;
+}
+.uni-page-head-btn .uni-btn-icon {
+    color: #fff !important;
+}
+.uni-app--showtabbar uni-page-wrapper,
+uni-page-head[uni-page-head-type=default]~uni-page-wrapper {
+    height: calc(100% - var(--window-bottom)) !important;
 }
 /* #endif */
 
@@ -621,9 +657,6 @@ button[disabled].bg-gray {
  */
 .scroll-box {
     height: 100vh;
-    /* #ifdef H5 */
-    height: calc(100vh - 44px);
-    /* #endif */
 }
 
 /**
@@ -631,9 +664,6 @@ button[disabled].bg-gray {
  */
 .scroll-box-ece-nav {
     height: calc(100vh - 80rpx);
-    /* #ifdef H5 */
-    height: calc(100vh - 80rpx - 44px);
-    /* #endif */
 }
 
 /**
diff --git a/components/online-service/online-service.vue b/components/online-service/online-service.vue
index ac2206cc..436dab70 100644
--- a/components/online-service/online-service.vue
+++ b/components/online-service/online-service.vue
@@ -97,7 +97,7 @@
             this.setData({
                 is_first: 0,
                 system: system,
-                x: win_width-52,
+                x: win_width-43,
                 y: (system.windowHeight || 450) - 380
             });
         },
@@ -145,19 +145,19 @@
     }
     .online-service-event-submit,
     .online-service-event-submit button {
-        width: 90rpx;
-        height: 90rpx;
+        width: 31px;
+        height: 31px;
         border-radius: 50%;
     }
     .online-service-event-submit button {
         border: 0;
-        padding: 15rpx;
+        padding: 5px;
         box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
         background: rgba(0, 0, 0, 0.6);
     }
     .online-service-event-submit image {
-        width: 60rpx !important;
-        height: 60rpx !important;
+        width: 21px !important;
+        height: 21px !important;
     }
     /* #ifdef MP-ALIPAY */
     .online-service-event-submit contact-button {
diff --git a/components/popup/popup.vue b/components/popup/popup.vue
index 4317cd02..742841bd 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'">
+            <view :class="'popup-content popup-' + (propPosition || 'bottom')+ ' '+(propIsBar ? 'popup-bar' : '')">
                 <slot></slot>
             </view>
         </view>
@@ -14,13 +14,35 @@
             return {};
         },
         components: {},
-        props: {
-            propClassname: String,
-            propShow: Boolean,
-            propPosition: String,
-            propMask: Boolean,
-            propAnimation: Boolean,
-            propDisablescroll: Boolean
+        props: {
+            propClassname: {
+            	type: String,
+            	default: ''
+            },
+            propShow: {
+            	type: Boolean,
+            	default: false
+            },
+            propPosition: {
+            	type: String,
+            	default: 'bottom'
+            },
+            propMask: {
+            	type: Boolean,
+            	default: true
+            },
+            propAnimation: {
+            	type: Boolean,
+            	default: true
+            },
+            propDisablescroll: {
+            	type: Boolean,
+            	default: false
+            },
+            propIsBar: {
+            	type: Boolean,
+            	default: false
+            }
         },
         methods: {
             onMaskTap: function onMaskTap() {
@@ -99,5 +121,10 @@
     .popup-right {
         border-top-left-radius: 20rpx;
         border-bottom-left-radius: 20rpx;
+    }
+    .popup-bar {
+        /* #ifdef H5 || APP */
+        bottom: var(--window-bottom) !important;
+        /* #endif */
     }
 </style>
\ No newline at end of file
diff --git a/components/quick-nav/quick-nav.vue b/components/quick-nav/quick-nav.vue
index 15670e7a..1422e702 100644
--- a/components/quick-nav/quick-nav.vue
+++ b/components/quick-nav/quick-nav.vue
@@ -8,7 +8,7 @@
         </movable-area>
 
         <!-- 弹窗 -->
-        <component-popup :propShow="popup_status" propPosition="bottom" @onclose="quick_close_event">
+        <component-popup :propShow="popup_status" :propIsBar="propIsBar" propPosition="bottom" @onclose="quick_close_event">
             <view :class="'nav-popup-container '+common_ent">
                 <view class="close oh">
                     <view class="icon-right" @tap.stop="quick_close_event">
@@ -103,8 +103,8 @@
             this.setData({
                 is_first: 0,
                 system: system,
-                x: 5,
-                y: (system.windowHeight || 450) - 200
+                x: 12,
+                y: (system.windowHeight || 450) - 260
             });
         },
         methods: {
@@ -158,16 +158,16 @@
     }
     .quick-event-submit {
         pointer-events: auto;
-        width: 100rpx;
-        height: 100rpx;
+        width: 31px;
+        height: 31px;
         border-radius: 50%;
         box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
         opacity: 0.8;
     }
     .quick-event-submit image {
-        width: 50rpx !important;
-        height: 50rpx !important;
-        margin: 25rpx auto 25rpx auto;
+        width: 17px !important;
+        height: 17px !important;
+        margin: 7px auto 7px auto;
         display: block;
     }
 
diff --git a/pages/cart/cart.css b/pages/cart/cart.css
index 727362d3..8b575525 100644
--- a/pages/cart/cart.css
+++ b/pages/cart/cart.css
@@ -81,10 +81,13 @@
 * 操作导航
 */
 .buy-nav {
-    position: fixed;
-    left: 0;
-    bottom: 0;
+    position: fixed;
     z-index: 2;
+    left: 0;
+    bottom: 0;
+    /* #ifdef H5 || APP */
+    bottom: var(--window-bottom);
+    /* #endif */
 }
 .buy-nav,
 .nav-base {
diff --git a/pages/cart/cart.vue b/pages/cart/cart.vue
index c45fc730..73a0176c 100644
--- a/pages/cart/cart.vue
+++ b/pages/cart/cart.vue
@@ -1,57 +1,60 @@
 <template>
     <view>
-        <view v-if="data_list.length > 0" class="page padding-main">
-            <uni-swipe-action>
-                <view v-for="(item, index) in data_list" :key="index" class="oh border-radius-main bg-white spacing-mb">
-                    <uni-swipe-action-item :right-options="swipe_options" @click="swipe_opt_event" @change="swipe_change($event, index)">
-                        <view :class="'goods-item padding-main pr ' + (common_site_type == 1 ? 'exhibition-mode-data' : '')">
-                            <!-- 选择 -->
-                            <view v-if="common_site_type != 1" @tap="selected_event" data-type="node" :data-index="index" class="fl selected">
-                                <image v-if="(item.is_error || 0) != 1" class="icon" :src="common_static_url+'select' + ((item.is_error || 0) == 1 ? '-disabled' : ((item.selected || false) ? '-active' : '')) + '-icon.png'" mode="widthFix"></image>
-                                <text v-if="(item.is_error || 0) == 1" class="cr-grey">失效</text>
-                            </view>
+        <view v-if="data_list.length > 0" class="page">
+            <!-- 数据列表 -->
+            <view class="padding-horizontal-main padding-top-main">
+                <uni-swipe-action>
+                    <view v-for="(item, index) in data_list" :key="index" class="oh border-radius-main bg-white spacing-mb">
+                        <uni-swipe-action-item :right-options="swipe_options" @click="swipe_opt_event" @change="swipe_change($event, index)">
+                            <view :class="'goods-item padding-main pr ' + (common_site_type == 1 ? 'exhibition-mode-data' : '')">
+                                <!-- 选择 -->
+                                <view v-if="common_site_type != 1" @tap="selected_event" data-type="node" :data-index="index" class="fl selected">
+                                    <image v-if="(item.is_error || 0) != 1" class="icon" :src="common_static_url+'select' + ((item.is_error || 0) == 1 ? '-disabled' : ((item.selected || false) ? '-active' : '')) + '-icon.png'" mode="widthFix"></image>
+                                    <text v-if="(item.is_error || 0) == 1" class="cr-grey">失效</text>
+                                </view>
 
-                            <view class="items">
-                                <navigator :url="'/pages/goods-detail/goods-detail?goods_id=' + item.goods_id" hover-class="none">
-                                    <!-- 图片 -->
-                                    <image :class="'goods-image fl radius '+((item.is_error || 0) == 1 ? 'opacity' : '')" :src="item.images" mode="aspectFill"></image>
-                                    <!-- 错误 -->
-                                    <view v-if="(item.is_error || 0) == 1" class="error-msg pa tc">
-                                        <text class="cr-red tc bg-white round">{{item.error_msg}}</text>
-                                    </view>
-                                </navigator>
-
-                                <!-- 基础 -->
-                                <view class="goods-base">
-                                    <!-- 标题、规格 -->
+                                <view class="items">
                                     <navigator :url="'/pages/goods-detail/goods-detail?goods_id=' + item.goods_id" hover-class="none">
-                                        <view :class="'goods-title multi-text margin-bottom-sm '+((item.is_error || 0) == 1 ? 'cr-grey' : '')">{{item.title}}</view>
+                                        <!-- 图片 -->
+                                        <image :class="'goods-image fl radius '+((item.is_error || 0) == 1 ? 'opacity' : '')" :src="item.images" mode="aspectFill"></image>
+                                        <!-- 错误 -->
+                                        <view v-if="(item.is_error || 0) == 1" class="error-msg pa tc">
+                                            <text class="cr-red tc bg-white round">{{item.error_msg}}</text>
+                                        </view>
                                     </navigator>
-                                    <view v-if="item.spec != null" class="margin-bottom-sm">
-                                        <block v-for="(sv, si) in item.spec" :key="si">
-                                            <text v-if="si > 0" class="cr-grey padding-left-xs padding-right-xs">;</text>
-                                            <text class="cr-gray">{{sv.value}}</text>
-                                        </block>
-                                    </view>
 
-                                    <!-- 底部内容 -->
-                                    <view class="goods-bottom pr margin-top-sm">
-                                        <!-- 价格 -->
-                                        <text class="sales-price">{{currency_symbol}}{{item.price}}</text>
-                                    
-                                        <!-- 数量 -->
-                                        <view v-if="(item.is_error || 0) != 1 && common_site_type != 1" class="number-content pa tc oh round br">
-                                            <view @tap="goods_buy_number_event" class="number-submit tc cr-gray fl va-m" :data-index="index" data-type="0">-</view>
-                                            <input @blur="goods_buy_number_blur" class="tc cr-gray fl va-m bg-white radius-0" type="number" :value="item.stock" :data-index="index">
-                                            <view @tap="goods_buy_number_event" class="number-submit tc cr-gray fl va-m" :data-index="index" data-type="1">+</view>
+                                    <!-- 基础 -->
+                                    <view class="goods-base">
+                                        <!-- 标题、规格 -->
+                                        <navigator :url="'/pages/goods-detail/goods-detail?goods_id=' + item.goods_id" hover-class="none">
+                                            <view :class="'goods-title multi-text margin-bottom-sm '+((item.is_error || 0) == 1 ? 'cr-grey' : '')">{{item.title}}</view>
+                                        </navigator>
+                                        <view v-if="item.spec != null" class="margin-bottom-sm">
+                                            <block v-for="(sv, si) in item.spec" :key="si">
+                                                <text v-if="si > 0" class="cr-grey padding-left-xs padding-right-xs">;</text>
+                                                <text class="cr-gray">{{sv.value}}</text>
+                                            </block>
+                                        </view>
+
+                                        <!-- 底部内容 -->
+                                        <view class="goods-bottom pr margin-top-sm">
+                                            <!-- 价格 -->
+                                            <text class="sales-price">{{currency_symbol}}{{item.price}}</text>
+                                        
+                                            <!-- 数量 -->
+                                            <view v-if="(item.is_error || 0) != 1 && common_site_type != 1" class="number-content pa tc oh round br">
+                                                <view @tap="goods_buy_number_event" class="number-submit tc cr-gray fl va-m" :data-index="index" data-type="0">-</view>
+                                                <input @blur="goods_buy_number_blur" class="tc cr-gray fl va-m bg-white radius-0" type="number" :value="item.stock" :data-index="index">
+                                                <view @tap="goods_buy_number_event" class="number-submit tc cr-gray fl va-m" :data-index="index" data-type="1">+</view>
+                                            </view>
                                         </view>
                                     </view>
                                 </view>
                             </view>
-                        </view>
-                    </uni-swipe-action-item>
-                </view>
-            </uni-swipe-action>
+                        </uni-swipe-action-item>
+                    </view>
+                </uni-swipe-action>
+            </view>
 
             <!-- 操作导航 -->
             <view v-if="data_list.length > 0" class="buy-nav oh wh-auto">
diff --git a/pages/login/login.css b/pages/login/login.css
index 6d5b826d..c9c45674 100644
--- a/pages/login/login.css
+++ b/pages/login/login.css
@@ -9,8 +9,8 @@ page {
     padding-top: 8%;
 }
 .content .icon {
-    width: 200rpx;
-    height: 200rpx !important;
+    width: 150rpx;
+    height: 150rpx !important;
 }
 
 /**
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 2bce2386..f24973d7 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -19,7 +19,7 @@
                                 </view>
                                 <button class="bg-main br-main cr-white round text-size margin-top-xxxl" form-type="submit" type="default" hover-class="none" :loading="form_submit_loading" :disabled="form_submit_loading">确认绑定</button>
                             </view>
-                            <view class="bottom-fixed padding-horizontal-main padding-bottom-xxxl tc">
+                            <view class="margin-top-xxxl padding-top-xxxl padding-horizontal-main padding-bottom-xxxl tc">
                                 <text class="cr-blue" data-value="bind" @tap="opt_form_event">返回上一页</text>
                             </view>
                         </form>
@@ -27,26 +27,32 @@
 
                     <!-- 确认绑定方式 -->
                     <view v-if="current_opt_form == 'bind'" class="form-content">
-                        <view class="tc">
-                            <image class="icon circle auto dis-block margin-bottom-xxl" :src="(user.avatar || null) == null ? '/static/images/default-user.png' : user.avatar" mode="widthFix"></image>
-                            <view v-if="(user.nickname || null) != null" class="cr-base">{{user.nickname}}</view>
-                        </view>
-                        <view class="margin-top-xxxl padding-top-xxxl">
-                            <button class="bg-main-pair br-main-pair cr-white round text-size" type="warn" hover-class="none" data-value="bind_verify" @tap="opt_form_event">手机验证码</button>
-                            <!-- #ifdef MP-WEIXIN || MP-BAIDU -->
-                            <button v-if="common_user_is_onekey_bind_mobile == 1" class="margin-top-xxl bg-main br-main cr-white round text-size" type="default" hover-class="none" open-type="getPhoneNumber" @getphonenumber="confirm_phone_number_event">获取手机号码一键登录</button>
-                            <!-- #endif -->
-                        </view>
-                        <!-- 当前还没有账号的情况下才可以操作登陆和注册绑定 -->
-                        <view v-if="(user || null) == null || (user.id || null) == null" class="bottom-fixed padding-horizontal-main padding-bottom-main">
-                            <!-- 登录 -->
-                            <view v-if="(home_user_login_type || null) != null && home_user_login_type.length > 0" class="margin-bottom-xxxl tc">
-                                <text class="cr-main round padding-top-xs padding-bottom-xs padding-horizontal-main" data-value="login" @tap="opt_form_event">绑定已有账号</text>
+                        <block v-if="(user.mobile || null) == null">
+                            <view class="tc">
+                                <image class="icon circle auto dis-block margin-bottom-xxl" :src="(user.avatar || null) == null ? '/static/images/default-user.png' : user.avatar" mode="widthFix"></image>
+                                <view v-if="(user.nickname || null) != null" class="cr-base">{{user.nickname}}</view>
                             </view>
-                            <!-- 注册 -->
-                            <view v-if="(home_user_reg_type || null) != null && home_user_reg_type.length > 0" class="margin-bottom-xl tc">
-                                <text class="cr-main-pair round padding-top-xs padding-bottom-xs padding-horizontal-main" data-value="reg" @tap="opt_form_event">注册账号并绑定</text>
+                            <view class="margin-top-xxxl padding-top-xxxl">
+                                <button class="bg-main-pair br-main-pair cr-white round text-size" type="warn" hover-class="none" data-value="bind_verify" @tap="opt_form_event">手机验证码</button>
+                                <!-- #ifdef MP-WEIXIN || MP-BAIDU -->
+                                <button v-if="common_user_is_onekey_bind_mobile == 1" class="margin-top-xxl bg-main br-main cr-white round text-size" type="default" hover-class="none" open-type="getPhoneNumber" @getphonenumber="confirm_phone_number_event">获取手机号码一键登录</button>
+                                <!-- #endif -->
                             </view>
+                            <!-- 当前还没有账号的情况下才可以操作登陆和注册绑定 -->
+                            <view v-if="(user || null) == null || (user.id || null) == null" class="margin-top-xxxl padding-top-xxxl padding-horizontal-main padding-bottom-main">
+                                <!-- 登录 -->
+                                <view v-if="(home_user_login_type || null) != null && home_user_login_type.length > 0" class="margin-bottom-xxxl tc">
+                                    <text class="cr-main round padding-top-xs padding-bottom-xs padding-horizontal-main" data-value="login" @tap="opt_form_event">绑定已有账号</text>
+                                </view>
+                                <!-- 注册 -->
+                                <view v-if="(home_user_reg_type || null) != null && home_user_reg_type.length > 0" class="margin-bottom-xl tc">
+                                    <text class="cr-main-pair round padding-top-xs padding-bottom-xs padding-horizontal-main" data-value="reg" @tap="opt_form_event">注册账号并绑定</text>
+                                </view>
+                            </view>
+                        </block>
+                        <view v-else class="tc">
+                            <view class="cr-base">已成功登陆、请点击进入首页</view>
+                            <navigator open-type="switchTab" url="/pages/index/index" class="dis-inline-block auto bg-main br-main cr-white round text-size-sm padding-left-xxxl padding-right-xxxl padding-top-xs padding-bottom-xs margin-top-xxxl">进入首页</navigator>
                         </view>
                     </view>
                 </block>
@@ -60,7 +66,7 @@
                         <!-- 账号密码 -->
                         <block v-if="current_opt_type == 'login_username'">
                             <input type="text" placeholder="输入用户名/手机/邮箱" maxlength="60" name="accounts" class="form-item margin-vertical-main wh-auto">
-                            <input type="text" placeholder="输入登录密码" minlength="6" maxlength="18" name="pwd" class="form-item margin-vertical-main wh-auto">
+                            <input type="text" placeholder="输入登录密码" minlength="6" maxlength="18" name="pwd" password="true" class="form-item margin-vertical-main wh-auto">
                             <view  v-if="home_user_login_img_verify_state == 1" class="verify pr margin-vertical-main">
                                 <input type="text" placeholder="验证码" name="verify" maxlength="4" :value="form_input_image_verify_value" @input="form_input_image_verify_event">
                                 <image v-if="(verify_image_url || null) != null" :src="verify_image_url" class="verify-image pa" mode="aspectFit" data-type="user_login" @tap="image_verify_event"></image>
@@ -97,7 +103,7 @@
                         <view class="margin-top-xxl tr">
                             <text class="cr-gray" data-value="forget" @tap="opt_form_event">找回密码</text>
                         </view>
-                        <view class="bottom-fixed padding-horizontal-main padding-bottom-main">
+                        <view class="margin-top-xxxl padding-top-xxxl padding-horizontal-main padding-bottom-main">
                             <!-- #ifdef MP -->
                             <!-- 小程序授权登陆 -->
                             <view class="margin-bottom-xxxl tc">
@@ -125,7 +131,7 @@
                         <!-- 账号密码 -->
                         <block v-if="current_opt_type == 'reg_username'">
                             <input type="text" placeholder="输入用户名" maxlength="60" name="accounts" class="form-item margin-vertical-main wh-auto">
-                            <input type="text" placeholder="输入登录密码" minlength="6" maxlength="18" name="pwd" class="form-item margin-vertical-main wh-auto">
+                            <input type="text" placeholder="输入登录密码" minlength="6" maxlength="18" name="pwd" password="true" class="form-item margin-vertical-main wh-auto">
                             <view  v-if="home_user_register_img_verify_state == 1" class="verify pr margin-vertical-main">
                                 <input type="text" placeholder="验证码" name="verify" maxlength="4" :value="form_input_image_verify_value" @input="form_input_image_verify_event">
                                 <image v-if="(verify_image_url || null) != null" :src="verify_image_url" class="verify-image pa" mode="aspectFit" data-type="user_reg" @tap="image_verify_event"></image>
@@ -138,7 +144,7 @@
                                 <input type="number" placeholder="验证码" name="verify" maxlength="4">
                                 <button :class="'verify-submit pa round br text-size-sm cr-base ' + (verify_disabled ? 'sub-disabled' : '')" type="default" hover-class="none" size="mini" :loading="verify_loading" :disabled="verify_disabled" @tap="verify_send_event">{{verify_submit_text}}</button>
                             </view>
-                            <input type="text" placeholder="输入登录密码" minlength="6" maxlength="18" name="pwd" class="form-item margin-vertical-main wh-auto">
+                            <input type="text" placeholder="输入登录密码" minlength="6" maxlength="18" name="pwd" password="true" class="form-item margin-vertical-main wh-auto">
                         </block>
                         <!-- 邮箱 -->
                         <block v-if="current_opt_type == 'reg_email'">
@@ -147,7 +153,7 @@
                                 <input type="number" placeholder="验证码" name="verify" maxlength="4">
                                 <button :class="'verify-submit pa round br text-size-sm cr-base ' + (verify_disabled ? 'sub-disabled' : '')" type="default" hover-class="none" size="mini" :loading="verify_loading" :disabled="verify_disabled" @tap="verify_send_event">{{verify_submit_text}}</button>
                             </view>
-                            <input type="text" placeholder="输入登录密码" minlength="6" maxlength="18" name="pwd" class="form-item margin-vertical-main wh-auto">
+                            <input type="text" placeholder="输入登录密码" minlength="6" maxlength="18" name="pwd" password="true" class="form-item margin-vertical-main wh-auto">
                         </block>
                         <!-- 协议 -->
                         <view class="margin-top-xxxl cr-gray">
@@ -161,7 +167,7 @@
                             </view>
                         </view>
                         <button class="bg-main br-main cr-white round text-size margin-top-xxxl" form-type="submit" type="default" hover-class="none" :loading="form_submit_loading" :disabled="form_submit_loading">确认注册</button>
-                        <view class="bottom-fixed padding-horizontal-main padding-bottom-main">
+                        <view class="margin-top-xxxl padding-top-xxxl padding-horizontal-main padding-bottom-main">
                             <!-- #ifdef MP -->
                             <!-- 小程序授权登陆 -->
                             <view class="margin-bottom-xxxl tc">
@@ -191,9 +197,9 @@
                             <input type="number" placeholder="验证码" name="verify" maxlength="4">
                             <button :class="'verify-submit pa round br text-size-sm cr-base ' + (verify_disabled ? 'sub-disabled' : '')" type="default" hover-class="none" size="mini" :loading="verify_loading" :disabled="verify_disabled" @tap="verify_send_event">{{verify_submit_text}}</button>
                         </view>
-                        <input type="text" placeholder="设置登录密码" minlength="6" maxlength="18" name="pwd" class="form-item margin-vertical-main wh-auto">
+                        <input type="text" placeholder="设置登录密码" minlength="6" maxlength="18" name="pwd" password="true" class="form-item margin-vertical-main wh-auto">
                         <button class="bg-main br-main cr-white round text-size margin-top-xxxl" form-type="submit" type="default" hover-class="none" :loading="form_submit_loading" :disabled="form_submit_loading">确认提交</button>
-                        <view class="bottom-fixed padding-horizontal-main padding-bottom-main">
+                        <view class="margin-top-xxxl padding-top-xxxl padding-horizontal-main padding-bottom-main">
                             <!-- #ifdef MP -->
                             <!-- 小程序授权登陆 -->
                             <view class="margin-bottom-xxxl tc">
@@ -241,7 +247,7 @@
                         <button class="margin-left-lg bg-green br-green cr-white round" type="default" size="mini" open-type="getAuthorize" @getAuthorize="get_user_info_event" scope="userInfo">使用授权自动登录</button>
                         <!-- #endif -->
                     </view>
-                    <view class="bottom-fixed padding-horizontal-main padding-bottom-main">
+                    <view class="margin-top-xxxl padding-top-xxxl padding-horizontal-main padding-bottom-main">
                         <!-- 登录 -->
                         <view v-if="(home_user_login_type || null) != null && home_user_login_type.length > 0" class="margin-bottom-xxxl tc">
                             <text class="cr-main round padding-top-xs padding-bottom-xs padding-horizontal-main" data-value="login" @tap="opt_form_event">已有账号？立即登录</text>
diff --git a/pages/plugins/activity/index/index.vue b/pages/plugins/activity/index/index.vue
index 04f7faca..b38e8a3c 100644
--- a/pages/plugins/activity/index/index.vue
+++ b/pages/plugins/activity/index/index.vue
@@ -13,14 +13,9 @@
                     <view :class="'item cr-gray dis-inline-block padding-horizontal-main ' + (nav_active_value == item.id ? 'cr-main' : '')" @tap="nav_event" :data-value="item.id">{{item.name}}</view>
                 </block>
             </scroll-view>
-            
-            <!-- 列表 -->
-            <!-- #ifdef MP -->
-            <scroll-view :scroll-y="true" class="scroll-box scroll-box-ece-nav" @scrolltolower="scroll_lower" lower-threshold="30" :style="slider_list.length > 0 ? 'height:calc(100vh - 320rpx);' : ''">
-            <!-- #endif -->
-            <!-- #ifdef H5 || APP -->
-            <scroll-view :scroll-y="true" class="scroll-box scroll-box-ece-nav" @scrolltolower="scroll_lower" lower-threshold="30" :style="slider_list.length > 0 ? 'height:calc(100vh - 320rpx - 44px);' : ''">
-            <!-- #endif -->
+
+            <!-- 列表 -->
+            <scroll-view :scroll-y="true" class="scroll-box scroll-box-ece-nav" @scrolltolower="scroll_lower" lower-threshold="30" :style="slider_list.length > 0 ? 'height:calc(100vh - 320rpx);' : ''">
                 <view v-if="(data_list || null) != null && data_list.length > 0" class="data-list padding-horizontal-main padding-top-main oh">
                     <block v-for="(item, index) in data_list" :key="index">
                         <view class="item border-radius-main bg-white oh spacing-mb">
diff --git a/pages/plugins/label/detail/detail.css b/pages/plugins/label/detail/detail.css
index f74ae805..7e85c64e 100644
--- a/pages/plugins/label/detail/detail.css
+++ b/pages/plugins/label/detail/detail.css
@@ -1,10 +1,10 @@
-/**
- * 基础信息
- */
-.label-info {
-    height: 40rpx;
-}
-
+/**
+ * 基础信息
+ */
+.label-info {
+    height: 40rpx;
+}
+
 /**
 * 排序导航
 */
@@ -21,13 +21,8 @@
 /**
 * 商品列表
 */
-.scroll-box {
-    /* #ifdef MP */
-    height: calc(100vh - 150rpx);
-    /* #endif */
-    /* #ifdef H5 */
-    height: calc(100vh - 150rpx - 44px);
-    /* #endif */
+.scroll-box {
+    height: calc(100vh - 150rpx);
 }
 .data-list .item {
     width: calc(50% - 10rpx);
diff --git a/pages/user/user.css b/pages/user/user.css
index c5affe0b..e9f7be65 100644
--- a/pages/user/user.css
+++ b/pages/user/user.css
@@ -6,17 +6,23 @@
     background-size: 100% auto;
     width: 100%;
     min-height: 300rpx;
+    padding-top: var(--status-bar-height);
 }
 .content {
-    padding-top: var(--status-bar-height);
+    padding-top: 35rpx;
 }
 
 /**
  * 头像
- */
+ */
+/* #ifdef H5 || APP */
+.head-base {
+    margin-bottom: 25rpx;
+}
+/* #endif */
 .head-avatar {
-    width: 100rpx;
-    height: 100rpx;
+    width: 120rpx;
+    height: 120rpx !important;
 }
 
 /**
@@ -33,9 +39,12 @@
  * 消息
  */
 .nav-message {
-    top: 55rpx;
-    right: 30rpx;
     z-index: 10;
+    right: 30rpx;
+    top: 60rpx;
+    /* #ifdef H5 || APP */
+    top: 0;
+    /* #endif */
 }
 .nav-message .badge-icon {
     top: -10px;
diff --git a/pages/user/user.vue b/pages/user/user.vue
index b1f5b62c..c6bbd2f8 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -7,10 +7,10 @@
 
             <!-- 内容 -->
             <view class="content padding-horizontal-main">
-                <view class="pr oh">
+                <view class="head-base pr oh">
                     <!-- 左侧头像 -->
                     <view class="padding-bottom-xxl oh tc fl">
-                        <image @tap="preview_event" @error="user_avatar_error" class="head-avatar round bg-white va-m" :src="avatar" mode="widthFix"></image>
+                        <image @tap="preview_event" @error="user_avatar_error" class="head-avatar circle bg-white va-m" :src="avatar" mode="widthFix"></image>
                         <text class="item-name cr-white va-m margin-left-lg">{{nickname}}</text>
                     </view>