From cfa5e0cb9316c8a98c28a2d7fb5759bcc7c57421 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Thu, 12 Oct 2023 09:45:23 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                 |  8 +++----
 pages.json                              |  4 +++-
 pages/goods-category/goods-category.css |  5 ++++-
 pages/goods-category/goods-category.vue | 28 ++++++++++++-------------
 pages/personal/personal.vue             |  2 +-
 5 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/App.vue b/App.vue
index 453b19c7..c682d5f3 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/pages.json b/pages.json
index 7eeac4c0..06371e6a 100644
--- a/pages.json
+++ b/pages.json
@@ -31,7 +31,9 @@
                 "titlePenetrate": "YES",
                 "navigationBarTitleText": "",
                 // #endif
-                "enablePullDownRefresh": false
+                "enablePullDownRefresh": false,
+                // 禁止页面下拉
+                "disableScroll": true
             }
         },
         {
diff --git a/pages/goods-category/goods-category.css b/pages/goods-category/goods-category.css
index 265678f0..6cd8fa76 100644
--- a/pages/goods-category/goods-category.css
+++ b/pages/goods-category/goods-category.css
@@ -2,7 +2,10 @@
  * 头部背景
  */
 .goods-top-bg {
+    height: calc(320rpx + var(--status-bar-height) + 5px);
+    /* #ifdef H5 */
     height: 286rpx;
+    /* #endif */
     background-color: #f5f5f5;
 }
 
@@ -26,7 +29,7 @@
     /* #endif */
     padding-bottom: 20rpx;
     height: 64rpx;
-    z-index: 101;
+    z-index: 5;
 }
 
 .category-content {
diff --git a/pages/goods-category/goods-category.vue b/pages/goods-category/goods-category.vue
index eaa4da68..cfd8f896 100644
--- a/pages/goods-category/goods-category.vue
+++ b/pages/goods-category/goods-category.vue
@@ -1,8 +1,8 @@
 <template>
-    <view>
+    <view :class="popup_status ? 'fixed-top' : ''">
         <view class="pr" :class="is_single_page == 1 ? 'margin-top-xxxl single-page-top' : ''">
-            <view class="goods-top-bg pa top-0 left-0 right-0 wh-auto oh">
-                <image :src="theme_static_url + 'top-bg.png'" mode="widthFix" class="wh-auto"></image>
+            <view v-if="category_list.length > 0" class="goods-top-bg pa top-0 left-0 right-0 wh-auto oh">
+                <image :src="theme_static_url + 'top-bg.png'" mode="scaleToFill" class="wh-auto"></image>
             </view>
             <!-- 搜索框 -->
             <block v-if="is_single_page == 0">
@@ -18,12 +18,12 @@
                     </block>
                 </view>
             </block>
-            <view v-if="category_list.length > 0">
+            <view v-if="category_list.length > 0" class="category-container">
                 <!-- 分类内容 -->
-                <view v-if="category_list.length > 0" :class="'category-content bs-bb pr ' + (category_show_level == 0 ? 'goods-model' : '')" :style="'height:calc(100vh - ' + search_height + 'px);'">
+                <view :class="'category-content bs-bb pr ' + (category_show_level == 0 ? 'goods-model' : '')" :style="'height:calc(100vh - ' + search_height + 'px);'">
                     <block v-if="category_show_level == 1">
                         <!-- 一级模式 -->
-                        <scroll-view scroll-y class="ht-auto">
+                        <scroll-view scroll-y class="ht-auto" show-scrollbar="false">
                             <view class="model-one padding-sm oh flex-row flex-warp">
                                 <block v-for="(item, index) in category_list" :key="index">
                                     <view class="content-item cp" :data-value="item.id" @tap="category_event">
@@ -43,8 +43,8 @@
                         <!-- 商品列表模式 -->
                         <block v-if="category_show_level == 0">
                             <!-- 一级导航 -->
-                            <view class="top-nav wh-auto pa scroll-view-horizontal">
-                                <scroll-view :scroll-x="true" :scroll-with-animation="true" :scroll-into-view="'one-nav-item-' + nav_active_index" class="top-nav-scroll">
+                            <view class="top-nav wh-auto pa scroll-view-horizontal bottom-0">
+                                <scroll-view :scroll-x="true" show-scrollbar="false" :scroll-with-animation="true" :scroll-into-view="'one-nav-item-' + nav_active_index" class="top-nav-scroll">
                                     <block v-for="(item, index) in category_list" :key="index">
                                         <view class="item tc cp dis-inline-block text-size-xss" :id="'one-nav-item-' + index" :data-index="index" :data-itemtwoindex="-1" :data-itemthreeindex="-1" @tap="nav_event">
                                             <view :class="'icon-content circle br auto ' + (nav_active_index == index ? 'border-color-main' : '')">
@@ -73,7 +73,7 @@
                             </view>
                             <!-- 二级导航 -->
                             <view v-if="category_one_subset_count > 0" class="left-nav bg-white ht-auto">
-                                <scroll-view :scroll-y="true" class="ht-auto">
+                                <scroll-view :scroll-y="true" show-scrollbar="false" class="ht-auto">
                                     <view :class="common_site_type != 1 ? 'left-content-actual ht-auto' : ''">
                                         <view class="left-content-actual-list ht-auto">
                                             <view :class="'text-size-sm item tc cr-base cp oh ' + (nav_active_item_two_index == -1 ? 'nav-active cr-main nav-left-border' : '')" :data-index="nav_active_index" :data-itemtwoindex="-1" :data-itemthreeindex="-1" @tap="nav_event">
@@ -92,11 +92,11 @@
                             </view>
                             <!-- 商品列表 -->
                             <view :class="'goods-right-content pa bs-bb ' + (category_one_subset_count > 0 ? '' : 'category-one-subset-content')">
-                                <scroll-view :scroll-y="true" class="ht-auto goods-list" :scroll-top="scroll_top" @scroll="scroll_event" @scrolltolower="scroll_lower" lower-threshold="60">
+                                <scroll-view :scroll-y="true" show-scrollbar="false" class="ht-auto goods-list" :scroll-top="scroll_top" @scroll="scroll_event" @scrolltolower="scroll_lower" lower-threshold="60">
                                     <view class="padding-top-main padding-left-sm" :class="(common_site_type != 1 ? 'right-content-actual' : '') + ' pr'">
                                         <!-- 三级导航 -->
                                         <view v-if="(data_three_content || null) != null && (data_three_content.items || null) != null && data_three_content.items.length > 0" class="word-list scroll-view-horizontal">
-                                            <scroll-view :scroll-x="true" :scroll-with-animation="true" :scroll-into-view="'three-nav-item-' + nav_active_item_three_index">
+                                            <scroll-view :scroll-x="true" show-scrollbar="false" :scroll-with-animation="true" :scroll-into-view="'three-nav-item-' + nav_active_item_three_index">
                                                 <view
                                                     :class="'word-icon dis-inline-block text-size-xs round padding-top-xs padding-bottom-xs padding-left padding-right ' + (nav_active_item_three_index == -1 ? 'bg-main-light br-main-light cr-main' : 'br-grey cr-grey')"
                                                     :data-index="nav_active_index"
@@ -185,7 +185,7 @@
                         <block v-else>
                             <!-- 一级导航 -->
                             <view class="left-nav bg-white ht-auto">
-                                <scroll-view :scroll-y="true" class="ht-auto">
+                                <scroll-view :scroll-y="true" class="ht-auto" show-scrollbar="false">
                                     <view :class="common_site_type != 1 ? 'left-content-actual ht-auto' : ''">
                                         <view class="left-content-actual-list ht-auto padding-0">
                                             <block v-for="(item, index) in category_list" :key="index">
@@ -198,7 +198,7 @@
                                 </scroll-view>
                             </view>
                             <view class="right-container pa">
-                                <scroll-view :scroll-y="true" class="ht-auto bg-white">
+                                <scroll-view :scroll-y="true" class="ht-auto bg-white" show-scrollbar="false">
                                     <!-- 一级内容基础容 -->
                                     <view v-if="(data_content || null) != null" class="oh">
                                         <view class="padding-top-main padding-horizontal-main">
@@ -294,7 +294,7 @@
                                         <text class="cr-red va-m text-size-xs">清空</text>
                                     </view>
                                 </view>
-                                <scroll-view :scroll-y="true" class="cart-list goods-list">
+                                <scroll-view :scroll-y="true" class="cart-list goods-list" show-scrollbar="false">
                                     <view v-for="(goods, index) in cart.data" :key="index" class="item padding-main oh spacing-mb">
                                         <navigator :url="goods.goods_url" hover-class="none">
                                             <image :src="goods.images" mode="widthFix" class="goods-img radius fl br"></image>
diff --git a/pages/personal/personal.vue b/pages/personal/personal.vue
index 724b7c62..a8c6321e 100644
--- a/pages/personal/personal.vue
+++ b/pages/personal/personal.vue
@@ -5,7 +5,7 @@
             <block v-if="data_list_loding_status == 3">
                 <form @submit="form_submit" class="form-container">
                     <view class="padding-main">
-                        <view class="bg-white border-radius-main">
+                        <view class="bg-white border-radius-main oh">
                             <view class="form-gorup oh flex-row jc-sb align-c">
                                 <view>头像</view>
                                 <view class="flex-row align-c">