From a00a679cebbd507eb4760137258bbf17aec4d8fe Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Thu, 2 Nov 2023 17:35:42 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=B5=8B=E8=AF=95=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                             |  2 +-
 pages/goods-search/goods-search.css | 45 ++++++++++++++---------------
 pages/plugins/brand/index/index.vue | 20 ++++++-------
 3 files changed, 32 insertions(+), 35 deletions(-)

diff --git a/App.vue b/App.vue
index dc722102..8262e030 100644
--- a/App.vue
+++ b/App.vue
@@ -74,7 +74,7 @@
                   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: 'https://new.shopxo.vip/',
                 // static_url: 'http://shopxo.com/',
                 // 系统类型（默认default、如额外独立小程序、可与程序分身插件实现不同主体小程序及支付独立）
                 system_type: 'default',
diff --git a/pages/goods-search/goods-search.css b/pages/goods-search/goods-search.css
index 570b4bb4..32fa6e47 100644
--- a/pages/goods-search/goods-search.css
+++ b/pages/goods-search/goods-search.css
@@ -1,22 +1,22 @@
-/**
- * 顶部搜索
- */
-.top-search-input {
-    padding-right: 80rpx;
-}
-.top-search-right {
-    top: 20rpx;
-    right: 20rpx;
-}
-.top-search-submit {
-    line-height: 66rpx;
-    height: 66rpx;
-}
-.top-search-right .badge-icon {
-    top: -4px;
-    right: 10rpx;
-}
-
+/**
+ * 顶部搜索
+ */
+.top-search-input {
+    padding-right: 80rpx;
+}
+.top-search-right {
+    top: 20rpx;
+    right: 20rpx;
+}
+.top-search-submit {
+    line-height: 66rpx;
+    height: 66rpx;
+}
+.top-search-right .badge-icon {
+    top: -4px;
+    right: 10rpx;
+}
+
 /**
 * 排序导航
 */
@@ -34,7 +34,7 @@
     height: 50rpx !important;
     top: 15rpx;
     right: 80rpx;
-}
+}
 .show-type-submit {
     width: 50rpx;
     height: 50rpx !important;
@@ -44,7 +44,7 @@
 
 /**
 * 商品列表
-*/
+*/
 .scroll-box {
     height: calc(100vh - 176rpx);
 }
@@ -98,9 +98,6 @@
 .map-content .item {
     margin-bottom: 20rpx;
 }
-.map-content .item:not(:last-child) {
-    margin-right: 20rpx;
-}
 .map-text-item .item,
 .map-images-text-item .item {
     padding: 0 15rpx;
diff --git a/pages/plugins/brand/index/index.vue b/pages/plugins/brand/index/index.vue
index 6d50805a..c70a29fe 100644
--- a/pages/plugins/brand/index/index.vue
+++ b/pages/plugins/brand/index/index.vue
@@ -4,22 +4,22 @@
             <view class="pr">
                 <!-- 分类 -->
                 <scroll-view v-if="(brand_category_list || null) != null && brand_category_list.length > 0" :scroll-x="true" :show-scrollbar="false" :scroll-with-animation="true" :scroll-into-view="'one-nav-item-' + nav_active_index" class="nav-list scroll-view-horizontal bg-white oh" scroll-x="true">
-                    <!-- <view class="flex-row flex-nowrap align-c"> -->
-                    <block v-for="(item, index) in brand_category_list" :key="index">
-                        <view class="item flex-col align-c text-size-xss dis-inline-block" :id="'one-nav-item-' + index" :data-index="index" :data-itemtwoindex="-1" :data-itemthreeindex="-1" @tap="nav_event" :data-value="item.id">
-                            <image :src="item.icon" mode="aspectFit"></image>
-                            <view class="padding-left-sm padding-right-sm round" :class="nav_active_value == item.id ? 'bg-main cr-white' : ''">
-                                {{ item.name }}
+                    <view class="flex-row flex-nowrap align-c">
+                        <block v-for="(item, index) in brand_category_list" :key="index">
+                            <view class="item flex-col align-c text-size-xss" :id="'one-nav-item-' + index" :data-index="index" @tap="nav_event" :data-value="item.id">
+                                <image :src="item.icon" mode="aspectFit"></image>
+                                <view class="padding-left-sm padding-right-sm round" :class="nav_active_value == item.id ? 'bg-main cr-white' : ''">
+                                    {{ item.name }}
+                                </view>
                             </view>
-                        </view>
-                    </block>
-                    <!-- </view> -->
+                        </block>
+                    </view>
                 </scroll-view>
                 <component-nav-more prop-class="bg-white" :prop-status="popupStatus" @open-popup="open_popup_event">
                     <view class="nav-list-more">
                         <view class="flex-row flex-warp align-c">
                             <block v-for="(item, index) in brand_category_list" :key="index">
-                                <view class="item flex-col align-c text-size-xss" @tap="nav_event" :data-value="item.id">
+                                <view class="item flex-col align-c text-size-xss" @tap="nav_event" :id="'one-nav-item-' + index" :data-index="index" :data-value="item.id">
                                     <image :src="item.icon" mode="aspectFit"></image>
                                     <view class="padding-left-sm padding-right-sm round" :class="nav_active_value == item.id ? 'bg-main cr-white' : ''">
                                         {{ item.name }}