From 7f6e67e55c1e6fd5af87b0795f48366c2d7b892a Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Sat, 9 Jul 2022 17:56:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E7=B1=BB=E7=BB=86=E8=8A=82=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                 | 10 ++++++----
 pages/goods-category/goods-category.vue |  6 ++++--
 pages/goods-search/goods-search.vue     |  8 ++++----
 pages/plugins/brand/index/index.vue     |  2 +-
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/App.vue b/App.vue
index 377b4ec2..74b2aef7 100644
--- a/App.vue
+++ b/App.vue
@@ -36,7 +36,9 @@
                 // 商品详情页底部导航是否开启购物车功能（0 否, 1 是）
                 is_goods_bottom_opt_cart: 1,
                 // 门店详情顶部导航返回按钮（0 否, 1 是）
-                is_realstore_top_nav_back: 1,
+                is_realstore_top_nav_back: 1,
+                // 分类页面商品列表模式一级分类使用图标类型（0 大图片, 1 icon图标）
+                category_goods_model_icon_type: 0,
                 // tabbar页面
                 tabbar_pages: [
                     "/pages/index/index",
@@ -45,16 +47,16 @@
                     "/pages/user/user"
                 ],
                 // 请求地址
-                request_url: 'http://shopxo.com/',
+                request_url: 'https://d1.shopxo.vip/',
                 // 静态资源地址（如系统根目录不在public目录下面请在静态地址后面加public目录、如：https://d1.shopxo.vip/public/）
-                static_url: 'http://shopxo.com/',
+                static_url: 'https://d1.shopxo.vip/',
                 // 系统类型（默认default、如额外独立小程序、可与程序分身插件实现不同主体小程序及支付独立）
                 system_type: 'default',
                 // 基础信息
                 application_title: "ShopXO",
                 application_describe: "ShopXO开源商城、MIT协议、可商用、可二次开发、满足99%电商运营需求",
                 // 版本号
-                version: "v2.2.8",
+                version: "v2.2.9",
                 // 货币价格符号
                 currency_symbol: "￥",
                 // 主题类型        主题颜色
diff --git a/pages/goods-category/goods-category.vue b/pages/goods-category/goods-category.vue
index 08beae77..5483ca04 100644
--- a/pages/goods-category/goods-category.vue
+++ b/pages/goods-category/goods-category.vue
@@ -32,7 +32,7 @@
                                 <block v-for="(item, index) in category_list" :key="index">
                                     <view :class="'text-size-sm item tc cr-base cp dis-inline-block ' + (nav_active_index == index ? 'cr-main border-color-main fw-b' : '')" :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' : '')">
-                                            <image :src="((item.icon || null) == null) ? common_static_url+'images.png' : item.icon" mode="aspectFit" class="icon dis-block auto wh-auto ht-auto circle"></image>
+                                            <image :src="((item[category_goods_model_icon_field] || null) == null) ? common_static_url+'images.png' : item[category_goods_model_icon_field]" mode="aspectFit" class="icon dis-block auto wh-auto ht-auto circle"></image>
                                         </view>
                                         <view class="margin-top-xs">{{item.name}}</view>
                                     </view>
@@ -221,7 +221,9 @@
                 // 自定义分享信息
                 share_info: {},
                 // 是否单页预览
-                is_single_page: app.globalData.is_current_single_page() || 0
+                is_single_page: app.globalData.is_current_single_page() || 0,
+                // 商品列表模式一级分类图标类型
+                category_goods_model_icon_field: app.globalData.data.category_goods_model_icon_type == 0 ? 'big_images' : 'icon'
             };
         },
 
diff --git a/pages/goods-search/goods-search.vue b/pages/goods-search/goods-search.vue
index 9f3687c6..d9d3d79a 100644
--- a/pages/goods-search/goods-search.vue
+++ b/pages/goods-search/goods-search.vue
@@ -68,7 +68,7 @@
                             <text>品牌</text>
                             <text class="arrow-bottom pa cr-grey cp" v-if="search_map_list.brand_list.length > 3" @tap="more_event" data-value="brand_list">更多</text>
                         </view>
-                        <view v-if="(search_map_info.brand || null) != null" class="map-content brand-info oh margin-top-lg">
+                        <view v-if="(search_map_info.brand || null) != null && (params.brand || null) != null" class="map-content brand-info oh margin-top-lg">
                             <image v-if="(search_map_info.brand.logo || null) != null" :src="search_map_info.brand.logo" mode="aspectFit" class="fl"></image>
                             <view v-else class="info-logo-empty tc fl">{{search_map_info.brand.name}}</view>
                             <view class="info-right fr">
@@ -305,12 +305,12 @@
 
                         // 基础自定义分享
                         var category_id = this.params.category_id || 0;
-                        var brand_id = this.params.brand_id || 0;
+                        var brand = this.params.brand || 0;
                         var keywords = this.params.keywords || '';
                         this.setData({
                             share_info: {
                                 path: '/pages/goods-search/goods-search',
-                                query: 'category_id=' + category_id + '&brand_id=' + brand_id + '&keywords=' + keywords
+                                query: 'category_id=' + category_id + '&brand=' + brand + '&keywords=' + keywords
                             }
                         });
 
@@ -414,7 +414,7 @@
 
                 // 指定分类、品牌
                 post_data['category_id'] = params['category_id'] || 0;
-                post_data['brand_id'] = params['brand_id'] || 0;
+                post_data['brand'] = params['brand'] || 0;
 
                 // 搜索条件
                 var temp_field = this.map_fields_list;
diff --git a/pages/plugins/brand/index/index.vue b/pages/plugins/brand/index/index.vue
index 921bf9a9..9b693f03 100644
--- a/pages/plugins/brand/index/index.vue
+++ b/pages/plugins/brand/index/index.vue
@@ -13,7 +13,7 @@
             <view v-if="(brand_list || null) != null && brand_list.length > 0" class="data-list padding-horizontal-main padding-top-main oh">
                 <block v-for="(item, index) in brand_list" :key="index">
                     <view v-if="(item.is_not_show || 0) == 0" class="item border-radius-main bg-white oh spacing-mb">
-                        <navigator :url="'/pages/goods-search/goods-search?brand_id=' + item.id" hover-class="none">
+                        <navigator :url="'/pages/goods-search/goods-search?brand=' + item.id" hover-class="none">
                             <image :src="item.logo" mode="aspectFit"></image>
                             <view class="padding-main tc">
                                 <view class="single-text fw-b cr-base">{{item.name}}</view>