From f24b8212f14ab07aea3df7d940554a9d30be3f00 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Fri, 13 Oct 2023 14:20:19 +0800
Subject: [PATCH] =?UTF-8?q?1.=E9=A1=B6=E9=83=A8=E8=BF=94=E5=9B=9E=E5=AF=BC?=
 =?UTF-8?q?=E8=88=AA=E6=94=B9=E4=B8=BA=E7=BB=84=E4=BB=B6=E5=B9=B6=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E8=BF=94=E5=9B=9E=E5=AF=BC=E8=88=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                          | 8 ++++----
 components/nav-back/nav-back.vue                 | 4 ++--
 pages/plugins/answers/index/index.css            | 6 ++----
 pages/plugins/answers/index/index.vue            | 8 ++++----
 pages/plugins/membershiplevelvip/index/index.css | 7 +++++++
 pages/plugins/membershiplevelvip/index/index.vue | 2 +-
 pages/plugins/seckill/index/index.css            | 2 +-
 pages/plugins/seckill/index/index.vue            | 2 +-
 8 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/App.vue b/App.vue
index c682d5f3..453b19c7 100644
--- a/App.vue
+++ b/App.vue
@@ -67,11 +67,11 @@
                 // tabbar页面
                 tabbar_pages: ['/pages/index/index', '/pages/goods-category/goods-category', '/pages/cart/cart', '/pages/user/user'],
                 // 请求地址
-                request_url: 'https://new.shopxo.vip/',
-                // request_url: 'http://shopxo.com/',
+                // request_url: 'https://new.shopxo.vip/',
+                request_url: 'http://shopxo.com/',
                 // 静态资源地址（如系统根目录不在public目录下面请在静态地址后面加public目录、如：https://d1.shopxo.vip/public/）
-                static_url: 'https://new.shopxo.vip/',
-                // static_url: 'http://shopxo.com/',
+                // static_url: 'https://new.shopxo.vip/',
+                static_url: 'http://shopxo.com/',
                 // 系统类型（默认default、如额外独立小程序、可与程序分身插件实现不同主体小程序及支付独立）
                 system_type: 'default',
                 // 基础信息
diff --git a/components/nav-back/nav-back.vue b/components/nav-back/nav-back.vue
index 94a62756..732f9007 100644
--- a/components/nav-back/nav-back.vue
+++ b/components/nav-back/nav-back.vue
@@ -1,9 +1,9 @@
 <template>
     <view>
-        <view class="112233 pa-w" :class="(propFixed ? 'pf z-i left-0 top-0 right-0' : '') + ' ' + propClass" :style="'padding-top:' + (status_bar_height > 0 ? status_bar_height + 5 : 0) + 'px;background-color:rgba(255,255,255,' + opacity + ');' + propStyle">
+        <view class="pa-w" :class="(propFixed ? 'pf z-i left-0 top-0 right-0' : '') + ' ' + propClass" :style="'padding-top:' + (status_bar_height > 0 ? status_bar_height + 5 : 0) + 'px;background-color:rgba(255,255,255,' + opacity + ');' + propStyle">
             <!-- 返回 -->
             <!-- #ifdef MP-WEIXIN || MP-QQ || MP-KUAISHOU || H5 || APP -->
-            <view v-if="is_realstore_top_nav_back == 1" class="nav-back padding-horizontal-main round va-m flex-row align-c" :class="(opacity > 0.3 ? 'cr-black ' : 'cr-white ') + (status_bar_height > 0 ? '' : 'padding-vertical-main')">
+            <view v-if="is_realstore_top_nav_back == 1" class="nav-back padding-horizontal-main round va-m flex-row align-c" :class="(opacity > 0.3 ? 'cr-black ' : 'cr-white ') + (status_bar_height > 0 ? 'padding-bottom-main' : 'padding-vertical-main')">
                 <view v-if="propName" class="text-size tc pa left-0 right-0 padding-top-xs" :style="propNameOpacity ? (opacity ? 'color:rgba(51,51,51,' + opacity + ')' : '') : ''">{{ propName }}</view>
                 <iconfont name="icon-tongyong-fanhui" size="40rpx" @tap="top_nav_left_back_event" class="pr top-xs z-i" :color="propColor"></iconfont>
                 <slot name="right"></slot>
diff --git a/pages/plugins/answers/index/index.css b/pages/plugins/answers/index/index.css
index e754d68d..27b345c9 100644
--- a/pages/plugins/answers/index/index.css
+++ b/pages/plugins/answers/index/index.css
@@ -4,11 +4,9 @@
 }
 
 .scroll-box {
-    height: calc(100vh - 166rpx - var(--status-bar-height) + 34rpx);
-    padding-top: calc(166rpx + var(--status-bar-height) + 34rpx);
+    height: calc(100vh - 194rpx - var(--status-bar-height) - 5px);
     /* #ifdef H5 */
-    height: calc(100vh - 166rpx);
-    padding-top: 166rpx;
+    height: calc(100vh - 170rpx);
     /* #endif */
 }
 
diff --git a/pages/plugins/answers/index/index.vue b/pages/plugins/answers/index/index.vue
index b834e8ac..5bf53f70 100644
--- a/pages/plugins/answers/index/index.vue
+++ b/pages/plugins/answers/index/index.vue
@@ -1,13 +1,13 @@
 <template>
     <view>
-        <component-nav-back prop-class="bg-white" prop-color="#333">
-            <template slot="right" :class="status_bar_height > 0 ? 'top-search-width' : 'flex-1 flex-width'">
-                <view class="margin-left-main" :class="status_bar_height > 0 ? 'top-search-width' : 'flex-1 flex-width'">
+        <component-nav-back :prop-fixed="false" prop-class="bg-white" prop-color="#333">
+            <template slot="right" :class="status_bar_height > 0 ? 'top-search-width' : ''">
+                <view class="margin-left-main" :class="status_bar_height > 0 ? '' : 'flex-1 flex-width'">
                     <component-search @onsearch="search_button_event" propIsOnEvent :propIsRequired="false" propIconColor="#ccc" propPlaceholderClass="cr-grey-c" propBgColor="#f6f6f6"></component-search>
                 </view>
             </template>
             <template slot="content">
-                <view v-if="nav_list.length > 0" class="answers-type flex-row jc-sa align-c" :class="status_bar_height > 0 ? 'padding-top-main' : ''">
+                <view v-if="nav_list.length > 0" class="answers-type flex-row jc-sa align-c">
                     <view v-for="(item, index) in nav_list" :key="index" class="flex-1 padding-vertical-sm tc" :class="nav_index === index ? 'cr-main fw-b nav-active-line' : 'cr-base'" :data-index="index" :data-type="item.type" @tap="nav_change_event">{{ item.name }}</view>
                 </view>
             </template>
diff --git a/pages/plugins/membershiplevelvip/index/index.css b/pages/plugins/membershiplevelvip/index/index.css
index 0cbae00b..833cce24 100644
--- a/pages/plugins/membershiplevelvip/index/index.css
+++ b/pages/plugins/membershiplevelvip/index/index.css
@@ -29,6 +29,13 @@
 /**
 * 等级介绍
 */
+.head-top {
+    padding-top: calc(94rpx + var(--status-bar-height) + 5px);
+    /* #ifdef H5 */
+    padding-top: 94rpx;
+    /* #endif */
+}
+
 .data-list .item {
     width: calc(100% / 3);
     margin-bottom: 20rpx;
diff --git a/pages/plugins/membershiplevelvip/index/index.vue b/pages/plugins/membershiplevelvip/index/index.vue
index ca332b44..f824afb8 100644
--- a/pages/plugins/membershiplevelvip/index/index.vue
+++ b/pages/plugins/membershiplevelvip/index/index.vue
@@ -4,7 +4,7 @@
         <view v-if="(data_base || null) != null" class="bg-white">
             <view class="pr wh-auto oh">
                 <image :src="membership_level_vip + 'bg.png'" mode="widthFix" class="vip-bg"></image>
-                <view class="banner oh pa top-0 pa-w wh-auto">
+                <view class="banner oh pa top-0 pa-w wh-auto head-top">
                     <view class="tc">
                         <image :src="membership_level_vip + 'title.png'" mode="widthFix" class="title-img"></image>
                         <!-- 标题 -->
diff --git a/pages/plugins/seckill/index/index.css b/pages/plugins/seckill/index/index.css
index 9dc38b1b..0cca1d83 100644
--- a/pages/plugins/seckill/index/index.css
+++ b/pages/plugins/seckill/index/index.css
@@ -56,7 +56,7 @@
  * 内容
  */
 .scroll-y {
-    height: calc(100vh - 234rpx - var(--status-bar-height) - 5px);
+    height: calc(100vh - 258rpx - var(--status-bar-height) - 5px);
     /* #ifdef H5 */
     height: calc(100vh - 234rpx);
     /* #endif */
diff --git a/pages/plugins/seckill/index/index.vue b/pages/plugins/seckill/index/index.vue
index 4291b588..ea2a5d53 100644
--- a/pages/plugins/seckill/index/index.vue
+++ b/pages/plugins/seckill/index/index.vue
@@ -89,7 +89,7 @@
                 status_bar_height: parseInt(app.globalData.get_system_info('statusBarHeight', 0)),
                 // 顶部导航返回按钮
                 is_realstore_top_nav_back: app.globalData.data.is_realstore_top_nav_back || 0,
-                seckill_bg: 'background: url(' + seckill_static_url + 'app/header-bg.png) top/100% no-repeat;',
+                seckill_bg: 'background: url(' + seckill_static_url + 'app/header-bg.png) top/100% no-repeat;background-size:100% 100%;',
                 seckill_title_url: seckill_static_url + 'seckill-title.png',
                 scroll_top: 0,
                 scroll_top_old: 0,