From 4e4f6f3ae552ebd5b98336f5559ff1a14e67000b Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Wed, 31 May 2023 17:52:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E5=95=86=E6=88=B7=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E8=AF=84=E5=88=86=E3=80=81=E8=B5=84=E8=B4=A8=E6=9F=A5=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                |   4 +-
 components/cart/cart.vue               |   4 +-
 pages.json                             |   7 ++
 pages/plugins/shop/design/design.css   |  21 +++--
 pages/plugins/shop/design/design.vue   |  97 ++++++++++++++-------
 pages/plugins/shop/detail/detail.css   |  12 ++-
 pages/plugins/shop/detail/detail.vue   |  75 ++++++++++++-----
 pages/plugins/shop/license/license.vue | 112 +++++++++++++++++++++++++
 8 files changed, 266 insertions(+), 66 deletions(-)
 create mode 100644 pages/plugins/shop/license/license.vue

diff --git a/App.vue b/App.vue
index ad46b95e..d09fda2c 100644
--- a/App.vue
+++ b/App.vue
@@ -44,9 +44,7 @@
                 // 门店详情顶部导航返回按钮（0 否, 1 是）
                 is_realstore_top_nav_back: 1,
                 // 门店详情搜索框内扫码加购（0否, 1是）
-                is_realstore_top_search_scan: 1,
-                // 多商户详情页面展示全站搜索（0否, 1是）
-                is_shop_whole_search: 1,
+                is_realstore_top_search_scan: 1,
                 // 开启浮动客服、前提是后台需要开启客服功能（0 否, 1 是）
                 is_online_service_fixed: 1,
                 // 分类页面商品列表模式一级分类使用图标类型（0 大图片, 1 icon图标）
diff --git a/components/cart/cart.vue b/components/cart/cart.vue
index 576f1cd4..e634158d 100644
--- a/components/cart/cart.vue
+++ b/components/cart/cart.vue
@@ -317,8 +317,8 @@
             // 数量处理方法
             goods_buy_number_func(index, buy_number) {
                 var temp_data_list = this.data_list;
-                var buy_min_number = parseInt(temp_data_list[index]['buy_min_number']) || 1;
-                var buy_max_number = parseInt(temp_data_list[index]['buy_max_number']) || 0;
+                var buy_min_number = parseInt(temp_data_list[index]['spec_buy_min_number']) || 1;
+                var buy_max_number = parseInt(temp_data_list[index]['spec_buy_max_number']) || 0;
                 var inventory = parseInt(temp_data_list[index]['inventory']);
                 var inventory_unit = temp_data_list[index]['inventory_unit'];
                 if (buy_number < buy_min_number) {
diff --git a/pages.json b/pages.json
index 3f1dcc9d..816a9b37 100644
--- a/pages.json
+++ b/pages.json
@@ -793,6 +793,13 @@
                 		"enablePullDownRefresh": true,
                 		"navigationBarTitleText": "店铺收藏"
                 	}
+                },
+                {
+                	"path": "license/license",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "工商资质"
+                	}
                 }
             ]
         },
diff --git a/pages/plugins/shop/design/design.css b/pages/plugins/shop/design/design.css
index a44a6412..01817d97 100644
--- a/pages/plugins/shop/design/design.css
+++ b/pages/plugins/shop/design/design.css
@@ -43,14 +43,14 @@
     font-size: 24rpx;
 }
 .shop-logo {
-    width: 280rpx;
+    width: 90rpx;
 }
 .base-bottom image {
     width: 28rpx;
     height: 28rpx;
 }
 .header .base {
-    width: calc(100% - 320rpx);
+    width: calc(100% - 110rpx);
 }
 .shop-title {
     line-height: 40rpx;
@@ -67,13 +67,16 @@
     font-size: 24rpx;
     -webkit-box-shadow: 0 10px 10px rgb(0 0 0 / 30%);
     box-shadow: 0 10px 10px rgb(0 0 0 / 30%);
-}
+}
 .header-service .item:first-child {
     border-top: 0 !important;
+}
+.header-service .qrcode .item:not(:last-child) {
+    margin-right: 20rpx;
 }
 .header-service image {
-    width: 260rpx;
-    height: 260rpx;
+    width: 130rpx;
+    height: 130rpx;
 }
 .header-service .chat-info image {
     width: 40rpx;
@@ -98,6 +101,14 @@
 .nav-shop-category {
     padding-right: 38rpx !important;
     background-size: 14px 14px;
+}
+.nav .nav-items {
+    width: 380rpx;
+    left: calc(50% - 190rpx);
+    top: 300rpx;
+    z-index: 1;
+    -webkit-box-shadow: 0 10px 10px rgb(0 0 0 / 30%);
+    box-shadow: 0 10px 10px rgb(0 0 0 / 30%);
 }
 
 /**
diff --git a/pages/plugins/shop/design/design.vue b/pages/plugins/shop/design/design.vue
index 4e63e9ba..27b8ea55 100644
--- a/pages/plugins/shop/design/design.vue
+++ b/pages/plugins/shop/design/design.vue
@@ -4,28 +4,23 @@
             <!-- 头部 -->
             <block v-if="(data.is_header || 0) == 1">
                 <!-- 搜索 -->
-                <view :class="'padding-main bg-white pr oh br-b search '+(is_shop_whole_search == 1 ? '' : 'header-shop-whole-search')">
+                <view :class="'padding-main bg-white pr oh br-b search '+(is_shop_search_all_search_button == 1 ? '' : 'header-shop-whole-search')">
                     <input class="bg-white fl padding-left-xxl text-size-xs round border-color-main" type="done" placeholder="请输入您搜索的商品关键字" :value="search_keywords_value || ''" placeholder-class="cr-grey" @input="search_keywords_event">
                     <view class="search-btn pa">
-                        <button class="bg-main br-main cr-white round text-size-xs" type="default" size="mini" hover-class="none" @tap="search_button_event" :data-value="'/pages/plugins/shop/search/search?shop_id='+shop.id+'&'">{{is_shop_whole_search == 1 ? '搜本店' : '搜索'}}</button>
-                        <button v-if="is_shop_whole_search == 1" class="bg-main-pair br-main-pair cr-white round text-size-xs" type="default" size="mini" hover-class="none" @tap="search_button_event" data-value="/pages/goods-search/goods-search?">搜全站</button>
+                        <button class="bg-main br-main cr-white round text-size-xs" type="default" size="mini" hover-class="none" @tap="search_button_event" :data-value="'/pages/plugins/shop/search/search?shop_id='+shop.id+'&'">{{is_shop_search_all_search_button == 1 ? '搜本店' : '搜索'}}</button>
+                        <button v-if="is_shop_search_all_search_button == 1" class="bg-main-pair br-main-pair cr-white round text-size-xs" type="default" size="mini" hover-class="none" @tap="search_button_event" data-value="/pages/goods-search/goods-search?">搜全站</button>
                     </view>
                 </view>
                 <!-- 顶部 -->
                 <view class="header plugins-shop-data-list bg-white oh">
-                    <image :src="shop.logo_long" mode="widthFix" class="shop-logo fl br-r padding-right-lg margin-top-xs cp"></image>
+                    <image :src="shop.logo" mode="widthFix" class="shop-logo fl border-radius-main cp"></image>
                     <view class="base fr item">
                         <view class="shop-title single-text">
                             <!-- 认证信息 -->
                             <view v-if="(data_base.is_enable_auth || 0) == 1 && ((shop.auth_type != -1 && (shop.auth_type_msg || null) != null) || ((shop.bond_status || 0) == 1 && (shop.bond_status_msg || null) != null))" class="auth-icon dis-inline-block">
                                 <!-- 实名认证 -->
-                                <block v-if="shop.auth_type != -1 && (shop.auth_type_msg || null) != null">
-                                    <block v-if="shop.auth_type == 0">
-                                        <image :src="data_base.shop_auth_personal_icon" class="icon va-m" mode="aspectFill"></image>
-                                    </block>
-                                    <block v-if="shop.auth_type == 1">
-                                        <image :src="data_base.shop_auth_company_icon" class="icon va-m" mode="aspectFill"></image>
-                                    </block>
+                                <block v-if="shop.auth_type != -1 && (shop.auth_type_msg || null) != null">
+                                    <image :src="shop.auth_type == 0 ? data_base.shop_auth_personal_icon : data_base.shop_auth_company_icon" class="icon va-m" mode="aspectFill" :data-value="'/pages/plugins/shop/license/license?id='+shop.id" @tap="url_event"></image>
                                 </block>
                                 <!-- 保证金认证 -->
                                 <block v-if="(shop.bond_status || 0) == 1 && (shop.bond_status_msg || null) != null">
@@ -35,15 +30,24 @@
                             <!-- 标题 -->
                             <text class="fw-b text-size va-m">{{shop.name}}</text>
                         </view>
-                        <view class="base-bottom oh margin-top-sm">
-                            <view v-if="(data_base.is_service_info || 0) == 1" class="fl margin-right-xxl cp" @tap="header_service_event">
-                                <image class="va-m margin-right-sm" :src="common_static_url+'customer-service-icon.png'" mode="scaleToFill"></image>
-                                <text class="va-m cr-base">在线客服</text>
-                            </view>
-                            <view class="fl single-text cp" @tap="shop_favor_event">
-                                <image class="va-m margin-right-sm" :src="common_static_url+'favor'+(shop_favor_info.status == 1 ? '-active' : '')+'-icon.png'" mode="scaleToFill"></image>
-                                <text :class="'va-m ' + (shop_favor_info.status == 1 ? 'cr-main' : '')">{{shop_favor_info.text}}({{shop_favor_info.count}})</text>
-                            </view>
+                        <view class="base-bottom oh margin-top-sm text-size-xs">
+                            <!-- 在线客服 -->
+                            <view v-if="(data_base.is_service_info || 0) == 1" class="fl margin-right-xxl cp" @tap="header_service_event">
+                                <image class="va-m margin-right-sm" :src="common_static_url+'customer-service-icon.png'" mode="scaleToFill"></image>
+                                <text class="va-m cr-base">在线客服</text>
+                            </view>
+                            <!-- 收藏 -->
+                            <view class="fl single-text cp" @tap="shop_favor_event">
+                                <image class="va-m margin-right-sm" :src="common_static_url+'favor'+(shop_favor_info.status == 1 ? '-active' : '')+'-icon.png'" mode="scaleToFill"></image>
+                                <text :class="'va-m ' + (shop_favor_info.status == 1 ? 'cr-main' : '')">{{shop_favor_info.text}}({{shop_favor_info.count}})</text>
+                            </view>
+                            <!-- 评分 -->
+                            <view v-if="(shop.score_data || null) != null" class="fl margin-left-xxl">
+                                <view class="dis-inline-block va-m">
+                                    <uni-rate :value="shop.score_data.value" :readonly="true" :is-fill="false" :size="14" />
+                                </view>
+                                <text class="va-m cr-red">{{shop.score_data.value}}分</text>
+                            </view>
                         </view>
                     </view>
                 </view>
@@ -68,7 +72,7 @@
                         <text>时间：</text>
                         <text class="cp" @tap="text_copy_event" :data-value="shop.open_week_name + '至' + shop.close_week_name + '，' + shop.open_time + '-' + shop.close_time">{{shop.open_week_name}}至{{shop.close_week_name}}，{{shop.open_time}}-{{shop.close_time}}</text>
                     </view>
-                    <view v-if="(shop.service_weixin_qrcode || null) != null || (shop.service_line_qrcode || null) != null" class="oh qrcode tc br-t">
+                    <view v-if="(shop.service_weixin_qrcode || null) != null || (shop.service_line_qrcode || null) != null" class="oh qrcode tc br-t padding-top-main">
                         <view v-if="(shop.service_weixin_qrcode || null) != null" class="item padding-bottom-lg dis-inline-block">
                             <image class="radius cp" :src="shop.service_weixin_qrcode" mode="scaleToFill" @tap="image_show_event" :data-value="shop.service_weixin_qrcode"></image>
                             <view>长按微信咨询</view>
@@ -83,10 +87,18 @@
                 <view v-if="shop_goods_category.length > 0 || shop_navigation.length > 0" class="nav scroll-view-horizontal bg-white padding-top-lg border-color-main">
                     <view v-if="shop_goods_category.length > 0" class="item padding-main arrow-bottom nav-shop-category dis-inline-block fw-b cp" @tap="nav_shop_category_event">查看商品分类</view>
                     <scroll-view scroll-x class="nav-scroll">
-                        <block v-if="shop_navigation.length > 0">
-                            <block v-for="(item, index) in shop_navigation" :key="index">
-                                <view class="item dis-inline-block fw-b cp" @tap="nav_event" :data-value="item.url" :data-index="index">{{item.name}}</view>
-                            </block>
+                        <block v-for="(item, index) in shop_navigation" :key="index">
+                            <block v-if="(item.items || null) == null || item.items.length == 0">
+                                <view class="item dis-inline-block fw-b cp" @tap="nav_event" :data-value="item.url" :data-index="index">{{item.name}}</view>
+                            </block>
+                            <block v-else>
+                                <view class="item dis-inline-block fw-b cp" @tap="nav_event" :data-index="index">{{item.name}}</view>
+                                <view v-if="(item.items_status || 0) == 1" class="nav-items pf border-radius-main oh bg-white br">
+                                    <block v-for="(items, index2) in item.items" :key="index2">
+                                        <view class="item fw-b cp margin-vertical-main" @tap="nav_event" :data-value="items.url" :data-index="index" :data-indexs="index2">{{items.name}}</view>
+                                    </block>
+                                </view>
+                            </block>
                         </block>
                     </scroll-view>
                     <view v-if="nav_category_status" class="nav-category bg-white pa tc">
@@ -109,7 +121,6 @@
 
             <!-- 结尾 -->
             <block v-if="(data.is_footer || 0) == 1">
-                <!-- 结尾 -->
                 <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
             </block>
         </view>
@@ -130,7 +141,7 @@
         data() {
             return {
                 common_static_url: common_static_url,
-                is_shop_whole_search: app.globalData.data.is_shop_whole_search || 0,
+                is_shop_search_all_search_button: 0,
                 data_bottom_line_status: false,
                 data_list_loding_status: 1,
                 data_list_loding_msg: '',
@@ -194,20 +205,22 @@
                     success: res => {
                         uni.stopPullDownRefresh();
                         if (res.data.code == 0) {
-                            var data = res.data.data;
+                            var data = res.data.data;
+                            var base = data.base || null;
                             this.setData({
-                                data_base: data.base || null,
+                                data_base: base,
                                 shop: (data.shop || null) == null || data.shop.length <= 0 ? null : data.shop,
                                 shop_favor_user: data.shop_favor_user || [],
                                 shop_navigation: data.shop_navigation || [],
-                                shop_goods_category: data.shop_goods_category || [],
+                                shop_goods_category: data.shop_goods_category || [],
+                                is_shop_search_all_search_button: (base == null || parseInt(base.is_shop_search_all_search_button || 0) != 1) ? 0 : 1,
                                 data: (data.data || null) != null && data.data.length != 0 ? data.data : null,
                                 layout_data: data.layout_data || [],
                                 data_list_loding_msg: '',
                                 data_list_loding_status: 0,
                                 data_bottom_line_status: true
                             });
-                            
+
                             // 收藏信息
                             if ((this.shop || null) != null) {
                                 var status = this.shop_favor_user.indexOf(this.shop.id) != -1 ? 1 : 0;
@@ -342,7 +355,27 @@
 
             // 导航事件
             nav_event(e) {
-                app.globalData.url_event(e);
+                // 存在子级则做子级显示隐藏处理
+                var value = e.currentTarget.dataset.value || null;
+                if(value == null) {
+                    var index = e.currentTarget.dataset.index;
+                    var temp_nav = this.shop_navigation;
+                    for(var i in temp_nav) {
+                        if(i == index) {
+                            temp_nav[i]['items_status'] = ((temp_nav[i]['items_status'] || 0) == 0) ? 1 : 0;
+                        } else {
+                            temp_nav[i]['items_status'] = 0;
+                        }
+                    }
+                    this.setData({shop_navigation: temp_nav});
+                } else {
+                    app.globalData.url_event(e);
+                }
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
             },
 
             // 剪切板
diff --git a/pages/plugins/shop/detail/detail.css b/pages/plugins/shop/detail/detail.css
index 86905b09..48dc9f39 100644
--- a/pages/plugins/shop/detail/detail.css
+++ b/pages/plugins/shop/detail/detail.css
@@ -45,14 +45,14 @@
     font-size: 24rpx;
 }
 .shop-logo {
-    width: 280rpx;
+    width: 90rpx;
 }
 .base-bottom image {
     width: 28rpx;
     height: 28rpx;
 }
 .header .base {
-    width: calc(100% - 320rpx);
+    width: calc(100% - 110rpx);
 }
 .shop-title {
     line-height: 40rpx;
@@ -103,6 +103,14 @@
 .nav-shop-category {
     padding-right: 38rpx !important;
     background-size: 14px 14px;
+}
+.nav .nav-items {
+    width: 380rpx;
+    left: calc(50% - 190rpx);
+    top: 300rpx;
+    z-index: 1;
+    -webkit-box-shadow: 0 10px 10px rgb(0 0 0 / 30%);
+    box-shadow: 0 10px 10px rgb(0 0 0 / 30%);
 }
 
 /**
diff --git a/pages/plugins/shop/detail/detail.vue b/pages/plugins/shop/detail/detail.vue
index ce655a7e..62bde02f 100644
--- a/pages/plugins/shop/detail/detail.vue
+++ b/pages/plugins/shop/detail/detail.vue
@@ -2,28 +2,23 @@
     <view>
         <view v-if="(shop || null) != null" class="pr">
             <!-- 搜索 -->
-            <view :class="'padding-main bg-white pr oh br-b search '+(is_shop_whole_search == 1 ? '' : 'header-shop-whole-search')">
+            <view :class="'padding-main bg-white pr oh br-b search '+(is_shop_search_all_search_button == 1 ? '' : 'header-shop-whole-search')">
                 <input class="bg-white fl padding-left-xxl text-size-xs round border-color-main" type="done" placeholder="请输入您搜索的商品关键字" :value="search_keywords_value || ''" placeholder-class="cr-grey" @input="search_keywords_event">
                 <view class="search-btn pa">
-                    <button class="bg-main br-main cr-white round text-size-xs" type="default" size="mini" hover-class="none" @tap="search_button_event" :data-value="'/pages/plugins/shop/search/search?shop_id='+shop.id+'&'">{{is_shop_whole_search == 1 ? '搜本店' : '搜索'}}</button>
-                    <button v-if="is_shop_whole_search == 1" class="bg-main-pair br-main-pair cr-white round text-size-xs" type="default" size="mini" hover-class="none" @tap="search_button_event" data-value="/pages/goods-search/goods-search?">搜全站</button>
+                    <button class="bg-main br-main cr-white round text-size-xs" type="default" size="mini" hover-class="none" @tap="search_button_event" :data-value="'/pages/plugins/shop/search/search?shop_id='+shop.id+'&'">{{is_shop_search_all_search_button == 1 ? '搜本店' : '搜索'}}</button>
+                    <button v-if="is_shop_search_all_search_button == 1" class="bg-main-pair br-main-pair cr-white round text-size-xs" type="default" size="mini" hover-class="none" @tap="search_button_event" data-value="/pages/goods-search/goods-search?">搜全站</button>
                 </view>
             </view>
             <!-- 顶部 -->
             <view class="header plugins-shop-data-list bg-white oh">
-                <image :src="shop.logo_long" mode="widthFix" class="shop-logo fl br-r padding-right-lg margin-top-xs cp"></image>
+                <image :src="shop.logo" mode="widthFix" class="shop-logo fl border-radius-main cp"></image>
                 <view class="base fr item">
                     <view class="shop-title single-text">
                         <!-- 认证信息 -->
                         <view v-if="(data_base.is_enable_auth || 0) == 1 && ((shop.auth_type != -1 && (shop.auth_type_msg || null) != null) || ((shop.bond_status || 0) == 1 && (shop.bond_status_msg || null) != null))" class="auth-icon dis-inline-block">
                             <!-- 实名认证 -->
-                            <block v-if="shop.auth_type != -1 && (shop.auth_type_msg || null) != null">
-                                <block v-if="shop.auth_type == 0">
-                                    <image :src="data_base.shop_auth_personal_icon" class="icon va-m" mode="aspectFill"></image>
-                                </block>
-                                <block v-if="shop.auth_type == 1">
-                                    <image :src="data_base.shop_auth_company_icon" class="icon va-m" mode="aspectFill"></image>
-                                </block>
+                            <block v-if="shop.auth_type != -1 && (shop.auth_type_msg || null) != null">
+                                <image :src="shop.auth_type == 0 ? data_base.shop_auth_personal_icon : data_base.shop_auth_company_icon" class="icon va-m" mode="aspectFill" :data-value="'/pages/plugins/shop/license/license?id='+shop.id" @tap="url_event"></image>
                             </block>
                             <!-- 保证金认证 -->
                             <block v-if="(shop.bond_status || 0) == 1 && (shop.bond_status_msg || null) != null">
@@ -33,14 +28,23 @@
                         <!-- 标题 -->
                         <text class="fw-b text-size va-m">{{shop.name}}</text>
                     </view>
-                    <view class="base-bottom oh margin-top-sm">
+                    <view class="base-bottom oh margin-top-sm text-size-xs">
+                        <!-- 在线客服 -->
                         <view v-if="(data_base.is_service_info || 0) == 1" class="fl margin-right-xxl cp" @tap="header_service_event">
                             <image class="va-m margin-right-sm" :src="common_static_url+'customer-service-icon.png'" mode="scaleToFill"></image>
                             <text class="va-m cr-base">在线客服</text>
-                        </view>
+                        </view>
+                        <!-- 收藏 -->
                         <view class="fl single-text cp" @tap="shop_favor_event">
                             <image class="va-m margin-right-sm" :src="common_static_url+'favor'+(shop_favor_info.status == 1 ? '-active' : '')+'-icon.png'" mode="scaleToFill"></image>
                             <text :class="'va-m ' + (shop_favor_info.status == 1 ? 'cr-main' : '')">{{shop_favor_info.text}}({{shop_favor_info.count}})</text>
+                        </view>
+                        <!-- 评分 -->
+                        <view v-if="(shop.score_data || null) != null" class="fl margin-left-xxl">
+                            <view class="dis-inline-block va-m">
+                                <uni-rate :value="shop.score_data.value" :readonly="true" :is-fill="false" :size="14" />
+                            </view>
+                            <text class="va-m cr-red">{{shop.score_data.value}}分</text>
                         </view>
                     </view>
                 </view>
@@ -66,7 +70,7 @@
                     <text>时间：</text>
                     <text class="cp" @tap="text_copy_event" :data-value="shop.open_week_name + '至' + shop.close_week_name + '，' + shop.open_time + '-' + shop.close_time">{{shop.open_week_name}}至{{shop.close_week_name}}，{{shop.open_time}}-{{shop.close_time}}</text>
                 </view>
-                <view v-if="(shop.service_weixin_qrcode || null) != null || (shop.service_line_qrcode || null) != null" class="oh qrcode tc br-t">
+                <view v-if="(shop.service_weixin_qrcode || null) != null || (shop.service_line_qrcode || null) != null" class="oh qrcode tc br-t padding-top-main">
                     <view v-if="(shop.service_weixin_qrcode || null) != null" class="item padding-bottom-lg dis-inline-block">
                         <image class="radius cp" :src="shop.service_weixin_qrcode" mode="scaleToFill" @tap="image_show_event" :data-value="shop.service_weixin_qrcode"></image>
                         <view>长按微信咨询</view>
@@ -82,8 +86,18 @@
                 <view v-if="shop_goods_category.length > 0" class="item padding-main arrow-bottom nav-shop-category dis-inline-block fw-b cp" @tap="nav_shop_category_event">查看商品分类</view>
                 <scroll-view scroll-x class="nav-scroll">
                     <block v-if="shop_navigation.length > 0">
-                        <block v-for="(item, index) in shop_navigation" :key="index">
-                            <view class="item dis-inline-block fw-b cp" @tap="nav_event" :data-value="item.url" :data-index="index">{{item.name}}</view>
+                        <block v-for="(item, index) in shop_navigation" :key="index">
+                            <block v-if="(item.items || null) == null || item.items.length == 0">
+                                <view class="item dis-inline-block fw-b cp" @tap="nav_event" :data-value="item.url" :data-index="index">{{item.name}}</view>
+                            </block>
+                            <block v-else>
+                                <view class="item dis-inline-block fw-b cp" @tap="nav_event" :data-index="index">{{item.name}}</view>
+                                <view v-if="(item.items_status || 0) == 1" class="nav-items pf border-radius-main oh bg-white br">
+                                    <block v-for="(items, index2) in item.items" :key="index2">
+                                        <view class="item fw-b cp margin-vertical-main" @tap="nav_event" :data-value="items.url" :data-index="index" :data-indexs="index2">{{items.name}}</view>
+                                    </block>
+                                </view>
+                            </block>
                         </block>
                     </block>
                 </scroll-view>
@@ -172,7 +186,7 @@
                 data_list_loding_status: 1,
                 data_list_loding_msg: '',
                 currency_symbol: app.globalData.data.currency_symbol,
-                is_shop_whole_search: app.globalData.data.is_shop_whole_search || 0,
+                is_shop_search_all_search_button: 0,
                 params: null,
                 user: null,
                 data_base: null,
@@ -247,14 +261,16 @@
                     success: res => {
                         uni.stopPullDownRefresh();
                         if (res.data.code == 0) {
-                            var data = res.data.data;
+                            var data = res.data.data;
+                            var base = data.base || null;
                             var temp_data = data.data || [];
                             this.setData({
-                                data_base: data.base || null,
+                                data_base: base,
                                 shop: data.shop || null,
                                 shop_favor_user: data.shop_favor_user || [],
                                 shop_navigation: data.shop_navigation || [],
-                                shop_goods_category: data.shop_goods_category || [],
+                                shop_goods_category: data.shop_goods_category || [],
+                                is_shop_search_all_search_button: (base == null || parseInt(base.is_shop_search_all_search_button || 0) != 1) ? 0 : 1,
                                 data: temp_data,
                                 slider: data.slider || [],
                                 data_list_loding_msg: '',
@@ -393,8 +409,23 @@
             },
 
             // 导航事件
-            nav_event(e) {
-                app.globalData.url_event(e);
+            nav_event(e) {
+                // 存在子级则做子级显示隐藏处理
+                var value = e.currentTarget.dataset.value || null;
+                if(value == null) {
+                    var index = e.currentTarget.dataset.index;
+                    var temp_nav = this.shop_navigation;
+                    for(var i in temp_nav) {
+                        if(i == index) {
+                            temp_nav[i]['items_status'] = ((temp_nav[i]['items_status'] || 0) == 0) ? 1 : 0;
+                        } else {
+                            temp_nav[i]['items_status'] = 0;
+                        }
+                    }
+                    this.setData({shop_navigation: temp_nav});
+                } else {
+                    app.globalData.url_event(e);
+                }
             },
 
             // url事件
diff --git a/pages/plugins/shop/license/license.vue b/pages/plugins/shop/license/license.vue
new file mode 100644
index 00000000..1fbb4eba
--- /dev/null
+++ b/pages/plugins/shop/license/license.vue
@@ -0,0 +1,112 @@
+<template>
+    <view>
+        <view v-if="(data || null) != null">
+            <!-- 主体信息 -->
+            <view class="padding-main">
+                <view class="fw-b text-size margin-top-xxl">{{data.title}}</view>
+                <view class="text-size-xs cr-gray margin-top-sm">{{data.sub_title}}</view>
+                <view class="br padding-main margin-top-lg bg-white border-radius-main">
+                    <image :src="data.images" class="wh-auto border-radius-main dis-block" mode="aspectFill" :data-value="data.images" @tap="image_show_event"></image>
+                </view>
+                <view v-if="(data.tips || null) != null && data.tips.length > 0" class="cr-grey margin-top-lg text-size-xs">
+                    <block v-for="(item, index) in data.tips" :key="index">
+                        <view class="margin-top-sm">{{item}}</view>
+                    </block>
+                </view>
+            </view>
+
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+        </view>
+        <view v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </view>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentNoData from "../../../../components/no-data/no-data";
+    import componentBottomLine from "../../../../components/bottom-line/bottom-line";
+    export default {
+        data() {
+            return {
+                data_bottom_line_status: false,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                params: null,
+                data: null,
+            };
+        },
+
+        components: {
+            componentNoData,
+            componentBottomLine
+        },
+        props: {},
+
+        onLoad(params) {
+            this.setData({
+                params: params
+            });
+        },
+
+        onShow() {
+            this.get_data();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.get_data();
+        },
+
+        methods: {
+            // 获取数据
+            get_data() {
+                uni.request({
+                    url: app.globalData.get_request_url("index", "license", "shop"),
+                    method: 'POST',
+                    data: {
+                        "id": this.params.id || 0
+                    },
+                    dataType: 'json',
+                    success: res => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                data: res.data.data || null,
+                                layout_data: data.layout_data || [],
+                                data_list_loding_msg: '',
+                                data_list_loding_status: 0,
+                                data_bottom_line_status: true
+                            });
+                        } else {
+                            this.setData({
+                                data_bottom_line_status: false,
+                                data_list_loding_status: 2,
+                                data_list_loding_msg: res.data.msg
+                            });
+                        }
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_bottom_line_status: false,
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: '服务器请求出错'
+                        });
+                        app.globalData.showToast('服务器请求出错');
+                    }
+                });
+            },
+
+            // 图片预览
+            image_show_event(e) {
+                app.globalData.image_show_event(e);
+            }
+        }
+    };
+</script>
+<style>
+</style>
\ No newline at end of file