diff --git a/App.vue b/App.vue
index 6e7394f5..97ad88c9 100644
--- a/App.vue
+++ b/App.vue
@@ -7,10 +7,10 @@
             data: {
                 // 基础配置
                 // 数据接口请求地址
-                request_url:'http://shopxo.com/',
+                request_url:'https://new.shopxo.vip/',
 
                 // 静态资源地址（如系统根目录不在public目录下面请在静态地址后面加public目录、如：https://d1.shopxo.vip/public/）
-                static_url:'http://shopxo.com/',
+                static_url:'https://new.shopxo.vip/',
 
                 // 系统类型（默认default、如额外独立小程序、可与程序分身插件实现不同主体小程序及支付独立）
                 system_type: 'default',
@@ -121,13 +121,16 @@
                 // 首页开启地理位置选择（0否, 1是）优先级高于logo展示
                 is_home_location_choice: 0,
 
-                // 门店详情顶部导航返回按钮（0否, 1是）
+                // 多商户 - 店铺详情顶部导航返回按钮（0否, 1是）
+                is_shop_top_nav_back: 1,
+
+                // 多门店 - 门店详情顶部导航返回按钮（0否, 1是）
                 is_realstore_top_nav_back: 1,
 
-                // 门店详情搜索框内扫码加购（0否, 1是）
+                // 多门店 - 门店详情搜索框内扫码加购（0否, 1是）
                 is_realstore_top_search_scan: 1,
 
-                // 门店详情阻止跳转到商品详情页面去（0否, 1是）
+                // 多门店 - 门店详情阻止跳转到商品详情页面去（0否, 1是）
                 is_realstore_forbid_to_goods_detail: 0,
 
                 // 钱包插件货币符号使用当前 currency_symbol 数据的固定值（0否, 1是）
diff --git a/components/nav-back/nav-back.vue b/components/nav-back/nav-back.vue
index 0f4f23ab..60847ccc 100644
--- a/components/nav-back/nav-back.vue
+++ b/components/nav-back/nav-back.vue
@@ -92,6 +92,7 @@
             });
         },
         methods: {
+            // 返回事件
             top_nav_left_back_event() {
                 app.globalData.page_back_prev_event();
             },
diff --git a/locale/en.json b/locale/en.json
index 6cfa5d9e..84f088f4 100644
--- a/locale/en.json
+++ b/locale/en.json
@@ -94,7 +94,9 @@
         "again_pay_text" : "Restart payment",
         "back_app_text" : "Return to APP",
         "base_info_text": "Basic info",
-        "form_input_data_text": "Form input Data"
+        "form_input_data_text": "Form input Data",
+        "two_nav_text" : "Secondary Navigation",
+        "no_data": "No data available at the moment"
 	},
     "client": {
         "weixin": "WeChat",
@@ -391,9 +393,8 @@
 			"41ty94": "Total pieces",
 			"xcj552": "element",
 			"7xtnjt": "Unconfigured data",
-			"7dikfm": "Pickup info",
             "0876xf": "Express delivery info",
-			"o38952": "Pickup code:",
+			"o38952": "Pickup code",
 			"0f26j2": "Order Information",
 			"ct34n5": "Extended Data",
 			"y9woor": "Key Information",
@@ -729,7 +730,7 @@
 			"54k10s": "Long press WeChat for consultation",
 			"vj4nom": "Long press line to consult",
 			"q42ger": "Product search",
-			"8q6345": "Please enter product keywords",
+			"8q6345": "Product keywords",
 			"rdxjvh": "Person sign in, total",
 			"15i191": "Integral, total",
 			"8ua11k": "organize a team",
@@ -1298,7 +1299,6 @@
 			"21kak7": "Online Service",
 			"745kx2": "branch",
 			"wtx1l8": "View product categories",
-			"83occ4": "There is currently no data available",
 			"ses9m2": "Please enter the keywords of the product you are searching for",
 			"i7725u": "Search",
 			"gv16tj": "to"
diff --git a/locale/zh.json b/locale/zh.json
index c810adef..a92737ac 100644
--- a/locale/zh.json
+++ b/locale/zh.json
@@ -94,7 +94,9 @@
         "again_pay_text" : "重新发起支付",
         "back_app_text" : "返回APP",
         "base_info_text": "基础信息",
-        "form_input_data_text": "表单数据"
+        "form_input_data_text": "表单数据",
+        "two_nav_text" : "二级导航",
+        "no_data": "暂无数据"
 	},
     "client": {
         "weixin": "微信",
@@ -381,9 +383,8 @@
 			"423rmr": "共",
 			"41ty94": "件 合计",
 			"7xtnjt": "未配置数据",
-			"7dikfm": "取货信息",
             "0876xf": "快递信息",
-			"o38952": "取货码：",
+			"o38952": "取货码",
 			"0f26j2": "订单信息",
 			"ct34n5": "扩展数据",
 			"y9woor": "密钥信息",
@@ -719,7 +720,7 @@
 			"54k10s": "长按微信咨询",
 			"vj4nom": "长按line咨询",
 			"q42ger": "商品搜索",
-			"8q6345": "请输入商品关键字",
+			"8q6345": "商品关键字",
 			"rdxjvh": "人签到，共",
 			"15i191": "积分，共",
 			"8ua11k": "组队",
@@ -1286,7 +1287,6 @@
 			"21kak7": "在线客服",
 			"745kx2": "分",
 			"wtx1l8": "查看商品分类",
-			"83occ4": "暂无数据",
 			"ses9m2": "请输入您搜索的商品关键字",
 			"i7725u": "搜本店",
 			"gv16tj": "至"
diff --git a/pages.json b/pages.json
index b5e37503..310d564b 100644
--- a/pages.json
+++ b/pages.json
@@ -1254,6 +1254,13 @@
                 {
                     "path": "detail/detail",
                     "style": {
+                        // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || APP
+                        "navigationStyle": "custom",
+                        // #endif
+                        // #ifdef MP-ALIPAY
+                        "transparentTitle": "auto",
+                        "titlePenetrate": "YES",
+                        // #endif
                         "navigationBarTitleText": "",
                         "usingComponents": {
                             "component-layout": "/pages/design/components/layout/layout",
@@ -1295,6 +1302,13 @@
                 {
                     "path": "design/design",
                     "style": {
+                        // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || APP
+                        "navigationStyle": "custom",
+                        // #endif
+                        // #ifdef MP-ALIPAY
+                        "transparentTitle": "auto",
+                        "titlePenetrate": "YES",
+                        // #endif
                         "enablePullDownRefresh": true,
                         "usingComponents": {
                             "component-layout": "/pages/design/components/layout/layout"
diff --git a/pages/diy/components/diy/diy.vue b/pages/diy/components/diy/diy.vue
index 2aee75e7..f7f2490a 100644
--- a/pages/diy/components/diy/diy.vue
+++ b/pages/diy/components/diy/diy.vue
@@ -3,12 +3,11 @@
         <view :style="page_img_style">
             <scroll-view :scroll-top="scroll_num_top" :scroll-y="true" class="ht" @scroll="on_scroll_event" @scrolltolower="on_scroll_lower_event" @scrolltoupper="on_scroll_upper_event" lower-threshold="60" scroll-with-animation="true">
                 <!-- 头部卡槽 -->
-                <slot name="header">
-                    <!-- 头部小程序兼容 -->
-                    <view class="pr header">
-                        <component-diy-header :propKey="header_data.id" :propValue="header_data.com_data" :propScrollTop="head_scroll_top" @onLocationBack="choice_location_back"></component-diy-header>
-                    </view>
-                </slot>
+                <slot name="header"></slot>
+                <!-- 头部小程序兼容 -->
+                <view v-if="propIsHeader" class="pr header">
+                    <component-diy-header :propKey="header_data.id" :propValue="header_data.com_data" :propScrollTop="head_scroll_top" @onLocationBack="choice_location_back"></component-diy-header>
+                </view>
                 <view :style="content_padding">
                     <view class="content flex-col" :style="'padding-top:calc(' + (temp_is_header_top ? temp_header_top + temp_sticky_top + 'px)' : '0px)')">
                         <view v-for="item in tabs_data" :key="item.key">
@@ -184,6 +183,10 @@
                 type: [String, Number],
                 default: 0,
             },
+            propIsHeader: {
+                type: Boolean,
+                default: true,
+            }
         },
         components: {
             componentDiyFooter,
diff --git a/pages/plugins/ask/goods-list/goods-list.vue b/pages/plugins/ask/goods-list/goods-list.vue
index 76847dde..4a251996 100644
--- a/pages/plugins/ask/goods-list/goods-list.vue
+++ b/pages/plugins/ask/goods-list/goods-list.vue
@@ -13,7 +13,9 @@
                             <view class="flex-1 flex-width">
                                 <mp-html :content="item.content" />
                                 <view v-if="(item.images || null) != null && item.images.length > 0" class="avatar spacing-mt-10 radius margin-right-sm oh">
-                                    <image v-for="(img, i) in item.images" class="wh-auto" @tap="comment_images_show_event" :data-index="i" :data-ix="i + 1" :src="img" mode="aspectFit"></image>
+                                    <block v-for="(img, i) in item.images" :key="i">
+                                        <image class="wh-auto" @tap="comment_images_show_event" :data-index="i" :data-ix="i + 1" :src="img" mode="aspectFit"></image>
+                                    </block>
                                 </view>
                             </view>
                         </view>
diff --git a/pages/plugins/realstore/orderallot-detail/orderallot-detail.css b/pages/plugins/realstore/orderallot-detail/orderallot-detail.css
index 52848c0d..0fb7bb8f 100644
--- a/pages/plugins/realstore/orderallot-detail/orderallot-detail.css
+++ b/pages/plugins/realstore/orderallot-detail/orderallot-detail.css
@@ -68,6 +68,6 @@
 * 自提信息
 */
 .site-extraction .panel-content .qrcode {
-    width: 260rpx;
-    height: 260rpx;
+    width: 340rpx;
+    height: 340rpx;
 }
\ No newline at end of file
diff --git a/pages/plugins/realstore/orderallot-detail/orderallot-detail.vue b/pages/plugins/realstore/orderallot-detail/orderallot-detail.vue
index ad031604..21fcf618 100644
--- a/pages/plugins/realstore/orderallot-detail/orderallot-detail.vue
+++ b/pages/plugins/realstore/orderallot-detail/orderallot-detail.vue
@@ -1,7 +1,19 @@
 <template>
     <view :class="theme_view">
         <block v-if="detail != null">
-            <view class="padding-horizontal-main padding-top-main">
+            <view class="padding-horizontal-main padding-top-main">
+                <!-- 自提信息 -->
+                <view v-if="(detail.extraction_data || null) != null" class="site-extraction panel-item padding-main border-radius-main bg-white spacing-mb">
+                    <view class="br-b padding-bottom-main fw-b text-size">{{$t('user-order-detail.user-order-detail.o38952')}}</view>
+                    <view class="panel-content oh tc padding-top-main">
+                        <view :data-value="detail.extraction_data.code" @tap="text_copy_event">
+                            <text class="fw-b cr-black text-size-xl va-m">{{ detail.extraction_data.code || $t("user-order-detail.user-order-detail.hpq62x") }}</text>
+                            <text class="bg-white br-green cr-green round padding-horizontal-sm text-size-xs va-m margin-left">{{$t('common.copy')}}</text>
+                        </view>
+                        <image v-if="(detail.extraction_data.images || null) != null" class="qrcode br radius margin-top-xs" :src="detail.extraction_data.images" mode="aspectFill"></image>
+                    </view>
+                </view>
+
                 <!-- 地址 -->
                 <view v-if="(detail.order_type == 0 || detail.order_type == 1 || detail.order_type == 2) && (detail.address_data || null) != null" class="address bg-white padding-horizontal-main padding-top-main border-radius-main spacing-mb">
                     <view class="address-base oh">
@@ -63,18 +75,6 @@
                     </view>
                 </view>
 
-                <!-- 自提信息 -->
-                <view v-if="(detail.extraction_data || null) != null" class="site-extraction panel-item padding-main border-radius-main bg-white spacing-mb">
-                    <view class="br-b padding-bottom-main fw-b text-size">{{$t('user-order-detail.user-order-detail.7dikfm')}}</view>
-                    <view class="panel-content oh padding-top-main">
-                        <view>
-                            <text>{{$t('user-order-detail.user-order-detail.o38952')}}</text>
-                            <text class="radius bg-green cr-white padding-left-sm padding-right-sm">{{ detail.extraction_data.code || $t("user-order-detail.user-order-detail.hpq62x") }}</text>
-                        </view>
-                        <image v-if="(detail.extraction_data.images || null) != null" class="qrcode br radius margin-top-lg" :src="detail.extraction_data.images" mode="aspectFill"></image>
-                    </view>
-                </view>
-
                 <!-- 订单基础数据 -->
                 <view v-if="detail_list.length > 0" class="panel-item padding-main border-radius-main bg-white spacing-mb">
                     <view class="br-b padding-bottom-main fw-b text-size">{{$t('user-order-detail.user-order-detail.0f26j2')}}</view>
diff --git a/pages/plugins/shop/components/shop-header/shop-header.vue b/pages/plugins/shop/components/shop-header/shop-header.vue
index ae659ba3..4a42de0f 100644
--- a/pages/plugins/shop/components/shop-header/shop-header.vue
+++ b/pages/plugins/shop/components/shop-header/shop-header.vue
@@ -1,22 +1,26 @@
 <template>
     <view :class="theme_view">
         <!-- 搜索 -->
-        <view class="flex-row jc-sb align-c padding-main bg-white pr oh">
+        <view class="flex-row jc-sb align-c padding-main bg-white oh bs-bb z-i search-content" :style="'padding-top:' + (status_bar_height > 0 ? status_bar_height + 5 : 0)+'px;'">
+            <view v-if="top_nav_left_back_status == 1" @tap="top_nav_left_back_event" class="dis-inline-block padding-right-sm">
+                <iconfont name="icon-arrow-left" size="40rpx" propClass="pr top-xs z-i"></iconfont>
+            </view>
             <view class="flex-1 wh-auto">
                 <view class="search flex-row jc-sb align-c round border-color-main bg-white">
                     <view class="flex-row align-c flex-1 wh-auto padding-left-main">
                         <iconfont name="icon-search-max" size="28rpx" color="#ccc"></iconfont>
-                        <input class="text-size-md flex-1 wh-auto padding-left-sm" type="done" :placeholder="$t('detail.detail.8q6345')" :value="search_keywords_value || ''" placeholder-class="cr-grey-c" @input="search_keywords_event" />
+                        <input class="text-size-xs flex-1 wh-auto padding-left-sm" type="done" :placeholder="$t('detail.detail.8q6345')" :value="search_keywords_value || ''" placeholder-class="cr-grey-c" @input="search_keywords_event" />
                     </view>
                     <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=' + propShop.id + '&'">
                         {{ is_shop_search_all_search_button == 1 ? $t('design.design.i7725u') : $t('common.search') }}
                     </button>
                 </view>
             </view>
-            <view v-if="is_shop_search_all_search_button == 1" class="search-btn padding-left-main flex-row align-c">
+            <view v-if="is_shop_search_all_search_button == 1" class="search-btn padding-left-sm flex-row align-c">
                 <button 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?">{{$t('design.design.ay7m42')}}</button>
             </view>
         </view>
+        <view class="search-content-seat" :style="'margin-top:' + (status_bar_height > 0 ? status_bar_height + 5 : 0)+'px;'"></view>
         <!-- 顶部 -->
         <view class="header plugins-shop-data-list bg-white oh">
             <image :src="propShop.logo" mode="widthFix" class="shop-logo fl border-radius-main cp" @tap="image_show_event" :data-value="propShop.logo"></image>
@@ -33,7 +37,7 @@
                 </view>
                 <view class="base-bottom oh margin-top-sm text-size-xs">
                     <!-- 在线客服 -->
-                    <view v-if="(propBase.is_service_info || 0) == 1" class="fl margin-right-xxl cp" @tap="popup_service_open_event">
+                    <view v-if="(propBase.is_service_info || 0) == 1" class="fl margin-right-xxl cp" @tap="popup_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">{{$t('design.design.21kak7')}}</text>
                     </view>
@@ -55,51 +59,81 @@
         
         <!-- 导航 -->
         <view v-if="((propShopGoodsCategory || null) != null && propShopGoodsCategory.length > 0) || ((shop_navigation || null) != null && shop_navigation.length > 0)" class="nav bg-white padding-sm flex-row">
-            <view v-if="propShopGoodsCategory.length > 0" class="item padding-main arrow-bottom nav-shop-category dis-inline-block cp" @tap="nav_shop_category_event">{{$t('recommend-form.recommend-form.203itn')}}</view>
-            <scroll-view scroll-x class="nav-scroll">
+            <view v-if="propShopGoodsCategory.length > 0" class="item padding-main arrow-bottom nav-shop-category dis-inline-block cp" @tap="popup_all_goods_category_event">{{$t('recommend-form.recommend-form.203itn')}}</view>
+            <scroll-view scroll-x class="nav-scroll" :class="propShopGoodsCategory.length > 0 ? 'category-all' : ''">
                 <view class="pr flex-row">
                     <block v-if="(shop_navigation || null) != null && shop_navigation.length > 0">
                         <block v-for="(item, index) in shop_navigation" :key="index">
-                            <block v-if="(item.items || null) == null || item.items.length == 0">
-                                <view class="item par dis-inline-block cp" @tap="nav_event" :data-value="item.url" :data-index="index">{{ item.name }}</view>
-                            </block>
-                            <block v-else>
-                                <view class="item par dis-inline-block cp" @tap="nav_event" :data-index="index">{{ item.name }}</view>
-                                <view v-if="(item.items_status || 0) == 1" class="nav-items pf oh bg-white cr-base">
-                                    <block v-for="(items, index2) in item.items" :key="index2">
-                                        <view class="item cp" @tap="nav_event" :data-value="items.url" :data-index="index" :data-indexs="index2">{{ items.name }}</view>
-                                    </block>
-                                </view>
-                            </block>
+                            <view class="item par dis-inline-block cp" @tap="nav_event" :data-value="((item.items || null) == null || item.items.length == 0) ? item.url : ''" :data-index="index">{{ item.name }}</view>
                         </block>
                     </block>
                 </view>
             </scroll-view>
-            <view v-if="nav_category_status" class="nav-category bg-white pa">
-                <scroll-view scroll-y class="category-scroll">
-                    <block v-if="(propShopGoodsCategory || null) != null && propShopGoodsCategory.length > 0">
-                        <block v-for="(item, index) in propShopGoodsCategory" :key="index">
-                            <view class="item dis-block cr-base single-text cp" @tap="shop_category_event" :data-value="item.id">{{ item.name }}</view>
-                            <block v-if="(item.items || null) != null && item.items.length > 0">
-                                <view v-for="(item2, index2) in item.items" :key="index2" class="padding-left-xl">
-                                    <view class="item dis-block cr-base single-text cp" @tap="shop_category_event" :data-value="item2.id">{{ item2.name }}</view>
-                                </view>
-                            </block>
-                        </block>
-                    </block>
-                    <block v-else>
-                        <view class="padding-top-xxl padding-bottom-xxl cr-grey">{{$t('design.design.83occ4')}}</view>
-                    </block>
-                </scroll-view>
-            </view>
         </view>
 
+        <!-- 导航二级分类弹窗 -->
+        <component-popup :propShow="popup_nav_two_category_status" propPosition="bottom" @onclose="popup_nav_two_category_event">
+            <view class="padding-top-main bg-white">
+                <view class="padding-horizontal-main padding-bottom-main">
+                    <view class="close oh">
+                        <text class="fw-b">{{$t('common.two_nav_text')}}</text>
+                        <view class="fr" @tap.stop="popup_nav_two_category_event">
+                            <iconfont name="icon-close-o" size="28rpx" color="#999"></iconfont>
+                        </view>
+                    </view>
+                </view>
+                <view class="popup-nav-category-container">
+                    <scroll-view scroll-y class="nav-two-scroll">
+                        <view v-if="shop_navigation_two_data.length > 0" class="cr-base padding">
+                            <block v-for="(item, index) in shop_navigation_two_data" :key="index">
+                                <view class="single-text cp padding-sm" @tap="nav_event" :data-value="item.url" :data-index="index">{{ item.name }}</view>
+                            </block>
+                        </view>
+                        <block v-else>
+                            <component-no-data propStatus="0" :propMsg="$t('common.no_data')"></component-no-data>
+                        </block>
+                    </scroll-view>
+                </view>
+            </view>
+        </component-popup>
+
+        <!-- 店铺全部商品分类弹窗 -->
+        <component-popup :propShow="popup_all_goods_category_status" propPosition="bottom" @onclose="popup_all_goods_category_event">
+            <view class="padding-top-main bg-white">
+                <view class="padding-horizontal-main padding-bottom-main">
+                    <view class="close oh">
+                        <text class="fw-b">{{$t('recommend-form.recommend-form.203itn')}}</text>
+                        <view class="fr" @tap.stop="popup_all_goods_category_event">
+                            <iconfont name="icon-close-o" size="28rpx" color="#999"></iconfont>
+                        </view>
+                    </view>
+                </view>
+                <view class="popup-nav-category-container">
+                    <scroll-view scroll-y class="category-scroll">
+                        <view v-if="(propShopGoodsCategory || null) != null && propShopGoodsCategory.length > 0" class="cr-base padding">
+                            <block v-for="(item, index) in propShopGoodsCategory" :key="index">
+                                <view class="single-text cp padding-sm" @tap="shop_goods_category_event" :data-value="item.id">{{ item.name }}</view>
+                                <block v-if="(item.items || null) != null && item.items.length > 0">
+                                    <view v-for="(item2, index2) in item.items" :key="index2" class="padding-left-xl">
+                                        <view class="single-text cp padding-sm" @tap="shop_goods_category_event" :data-value="item2.id">{{ item2.name }}</view>
+                                    </view>
+                                </block>
+                            </block>
+                        </view>
+                        <block v-else>
+                            <component-no-data propStatus="0" :propMsg="$t('common.no_data')"></component-no-data>
+                        </block>
+                    </scroll-view>
+                </view>
+            </view>
+        </component-popup>
+
         <!-- 客服弹窗 -->
-        <component-popup :propShow="popup_service_status" propPosition="bottom" @onclose="popup_service_close_event">
+        <component-popup :propShow="popup_service_status" propPosition="bottom" @onclose="popup_service_event">
             <view class="padding-top-main bg-white">
                 <view class="padding-horizontal-main">
                     <view class="close oh">
-                        <view class="fr" @tap.stop="popup_service_close_event">
+                        <view class="fr" @tap.stop="popup_service_event">
                             <iconfont name="icon-close-o" size="28rpx" color="#999"></iconfont>
                         </view>
                     </view>
@@ -144,6 +178,7 @@
 <script>
     const app = getApp();
     import componentPopup from '@/components/popup/popup';
+    import componentNoData from '@/components/no-data/no-data';
     var common_static_url = app.globalData.get_static_url('common');
     export default {
         props: {
@@ -175,19 +210,34 @@
                 is_shop_search_all_search_button: 0,
                 search_keywords_value: '',
                 popup_service_status: false,
-                nav_category_status: false,
-                shop_category_tab_value: 0,
+                popup_all_goods_category_status: false,
                 shop_navigation: [],
+                shop_navigation_two_data: [],
+                popup_nav_two_category_status: false,
                 shop_favor_info: {
                     "text": this.$t('goods-detail.goods-detail.dco1sc'),
                     "status": 0,
                     "count": 0
                 },
+                // 左侧返回按钮
+                top_nav_left_back_status: app.globalData.data.is_shop_top_nav_back || 0,
+                // #ifdef MP-TOUTIAO
+                top_nav_left_back_status : 0,
+                // #endif
+                // 状态栏高度
+                status_bar_height: 0,
+                // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || MP-ALIPAY || APP
+                status_bar_height: parseInt(app.globalData.get_system_info('statusBarHeight', 0, true)),
+                // #endif
+                // #ifdef H5
+                status_bar_height: 5,
+                // #endif
             };
         },
 
         components: {
-            componentPopup
+            componentPopup,
+            componentNoData
         },
         created() {
             this.init();
@@ -260,50 +310,46 @@
                 app.globalData.url_open(value + 'keywords=' + this.search_keywords_value || '');
             },
 
-            // 导航分类事件
-            nav_shop_category_event(e) {
+            // 店铺全部商品分类事件
+            popup_all_goods_category_event(e) {
                 this.setData({
-                    nav_category_status: !this.nav_category_status
+                    popup_all_goods_category_status: !this.popup_all_goods_category_status
                 });
             },
 
             // 分类事件
-            shop_category_event(e) {
+            shop_goods_category_event(e) {
                 var value = e.currentTarget.dataset.value || null;
                 app.globalData.url_open('/pages/plugins/shop/search/search?shop_id=' + this.propShop.id + '&category_id=' + value);
+                this.popup_all_goods_category_event();
             },
 
             // 导航事件
             nav_event(e) {
-                // 存在子级则做子级显示隐藏处理
                 var value = e.currentTarget.dataset.value || null;
                 if(value == null) {
                     var index = e.currentTarget.dataset.index;
-                    var temp_nav = this.propShopNavigation;
-                    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});
+                    this.setData({
+                        shop_navigation_two_data: this.propShopNavigation[index]['items'] || [],
+                        popup_nav_two_category_status: true
+                    });
                 } else {
                     app.globalData.url_event(e);
+                    this.popup_nav_two_category_event();
                 }
             },
-
-            // 开启客服弹层
-            popup_service_open_event(e) {
+            
+            // 店铺导航二级事件弹窗
+            popup_nav_two_category_event(e) {
                 this.setData({
-                    popup_service_status: true,
+                    popup_nav_two_category_status: !this.popup_nav_two_category_status
                 });
             },
 
-            // 关闭客服弹层
-            popup_service_close_event(e) {
+            // 客服弹层事件
+            popup_service_event(e) {
                 this.setData({
-                    popup_service_status: false,
+                    popup_service_status: !this.popup_service_status
                 });
             },
 
@@ -330,6 +376,11 @@
             // 进入客服系统
             chat_event() {
                 app.globalData.chat_entry_handle(this.propShop.chat_info.chat_url);
+            },
+
+            // 返回事件
+            top_nav_left_back_event() {
+                app.globalData.page_back_prev_event();
             }
         },
     };
@@ -344,27 +395,51 @@
     }
     
     .search button {
-        width: 140rpx;
-        height: 56rpx;
-        line-height: 56rpx;
+        width: 124rpx;
+        height: 52rpx;
+        line-height: 52rpx;
         padding: 0;
     }
     
     .search input {
-        height: 56rpx;
-        line-height: 56rpx;
+        height: 50rpx;
+        line-height: 50rpx;
     }
     
     .search-btn {
-        width: 148rpx;
+        width: 124rpx;
     }
     
     .search-btn button {
         width: 100%;
         padding: 0;
-        height: 64rpx;
-        line-height: 64rpx;
+        height: 60rpx;
+        line-height: 60rpx;
     }
+    .search-content {
+        position: fixed;
+        left: auto;
+        top: 0;
+        width: 100%;
+        /* #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU */
+        padding-right: 200rpx;
+        /* #endif */
+    }
+    .search-content-seat {
+        height: 74rpx;
+    }
+    /* #ifdef H5 */
+    @media only screen and (min-width: 1600rpx) {
+        .search-content {
+            width: 1560rpx;
+        }
+    }
+    @media only screen and (min-width: 961px) {
+        .search-content {
+            width: 800px;
+        }
+    }
+    /* #endif */
     
     /**
     * 头部
@@ -396,9 +471,11 @@
     */
     .nav .nav-scroll {
         float: right;
+        width: 100%;
+    }
+    .nav .nav-scroll.category-all {
         width: calc(100% - 172rpx);
     }
-    
     .nav .nav-scroll .item.par {
         height: 56rpx;
         line-height: 56rpx;
@@ -416,36 +493,20 @@
         line-height: 56rpx;
     }
     
-    .nav .nav-items {
-        left: calc(50% - 212rpx);
-        top: 322rpx;
-        z-index: 1;
-        border-radius: 0 0 8rpx 8rpx;
-        box-shadow: 0 12rpx 12rpx rgb(0 0 0 / 10%);
-    }
-    
-    .nav .nav-items .item {
-        padding: 20rpx;
+    /**
+    * 导航二级分类弹窗
+    */
+    .popup-nav-category-container .nav-two-scroll {
+        max-height: 600rpx;
     }
     
     /**
     * 导航商品分类
     */
-    .nav-category {
-        z-index: 1;
-        box-shadow: 0 12rpx 12rpx rgb(0 0 0 / 10%);
-        border-bottom-right-radius: 8rpx;
-        margin-top: 70rpx;
-    }
-    
-    .nav-category .category-scroll {
+    .popup-nav-category-container .category-scroll {
         max-height: 600rpx;
     }
     
-    .nav-category .item {
-        padding: 20rpx 30rpx;
-    }
-    
     /**
     * 商品分类切换
     */
diff --git a/pages/plugins/shop/detail/detail.vue b/pages/plugins/shop/detail/detail.vue
index 958dd3ff..615896a1 100644
--- a/pages/plugins/shop/detail/detail.vue
+++ b/pages/plugins/shop/detail/detail.vue
@@ -5,7 +5,7 @@
             <block v-if="shop.data_model == 3">
                 <block v-if="(data || null) != null && (data.diy_data || null) != null && (data.diy_data.config || null) != null">
                     <!-- diy组件 -->
-                    <component-diy :propValue="data.diy_data.config" :propDataId="data.diy_data.id" :propKey="random_value" @onLocationBack="user_back_choice_location">
+                    <component-diy :propValue="data.diy_data.config" :propDataId="data.diy_data.id" :propKey="random_value" :propIsHeader="(data.is_header || 0) != 1" @onLocationBack="user_back_choice_location">
                         <!-- 头部 -->
                         <block v-if="(data.is_header || 0) == 1">
                             <template slot="header">
@@ -30,9 +30,16 @@
                 </block>
             </block>
             <!-- 自动和手动模式 -->
-            <block v-else>
-                <!-- 头部 -->
+            <block v-else>
+                <!-- <component-nav-back :persopName="shop.name || $t('index.index.p4872s')" :propIsShowBack="false" :propIsRightSlot="false" :propFixed="false" propClass="bg-white" propNameClass="cr-black">
+                    <template slot="content">
+                        
+                    </template>
+                </component-nav-back> -->
+                
+                <!-- 头部 -->
                 <component-shop-header :propBase="data_base" :propShop="shop" :propShopGoodsCategory="shop_goods_category" :propShopNavigation="shop_navigation" :propShopFavorUser="shop_favor_user"></component-shop-header>
+                
 
                 <!-- 数据模式 -->
                 <!-- 自动模式 -->
@@ -103,6 +110,7 @@
     import componentBanner from '@/components/slider/slider';
     import componentGoodsList from '@/components/goods-list/goods-list';
     import componentShopHeader from '@/pages/plugins/shop/components/shop-header/shop-header';
+    import componentNavBack from '@/components/nav-back/nav-back';
     import componentDiy from '@/pages/diy/components/diy/diy';
     var common_static_url = app.globalData.get_static_url('common');
     export default {
@@ -141,6 +149,7 @@
             componentBanner,
             componentGoodsList,
             componentShopHeader,
+            componentNavBack,
             componentDiy
         },
         onLoad(params) {
@@ -275,6 +284,6 @@
         }
     };
 </script>
-<style>
+<style scoped>
     @import './detail.css';
 </style>
\ No newline at end of file
diff --git a/pages/plugins/shop/search/search.vue b/pages/plugins/shop/search/search.vue
index 3fe723c6..59cfee20 100644
--- a/pages/plugins/shop/search/search.vue
+++ b/pages/plugins/shop/search/search.vue
@@ -205,6 +205,7 @@
                                     if((category[i]['items'] || null) != null && category[i]['items'].length > 0) {
                                         for(var x in category[i]['items']) {
                                             category[i]['items'][x]['active'] = (category[i]['items'][x]['id'] == this.params.category_id) ? 1 : 0;
+                                            category[i]['active'] = 1;
                                         }
                                     }
                                 }
diff --git a/pages/user-order-detail/user-order-detail.css b/pages/user-order-detail/user-order-detail.css
index 942fb9a4..8be2e516 100644
--- a/pages/user-order-detail/user-order-detail.css
+++ b/pages/user-order-detail/user-order-detail.css
@@ -61,6 +61,6 @@
 * 自提信息
 */
 .site-extraction .panel-content .qrcode {
-    width: 260rpx;
-    height: 260rpx;
+    width: 340rpx;
+    height: 340rpx;
 }
\ No newline at end of file
diff --git a/pages/user-order-detail/user-order-detail.vue b/pages/user-order-detail/user-order-detail.vue
index e85576b6..9658a1d7 100644
--- a/pages/user-order-detail/user-order-detail.vue
+++ b/pages/user-order-detail/user-order-detail.vue
@@ -1,7 +1,19 @@
 <template>
     <view :class="theme_view">
         <block v-if="detail != null">
-            <view class="padding-horizontal-main padding-top-main">
+            <view class="padding-horizontal-main padding-top-main">
+                <!-- 自提信息 -->
+                <view v-if="(detail.extraction_data || null) != null" class="site-extraction panel-item padding-main border-radius-main bg-white spacing-mb">
+                    <view class="br-b padding-bottom-main fw-b text-size">{{$t('user-order-detail.user-order-detail.o38952')}}</view>
+                    <view class="panel-content oh tc padding-top-main">
+                        <view :data-value="detail.extraction_data.code" @tap="text_copy_event">
+                            <text class="fw-b cr-black text-size-xl va-m">{{ detail.extraction_data.code || $t("user-order-detail.user-order-detail.hpq62x") }}</text>
+                            <text class="bg-white br-green cr-green round padding-horizontal-sm text-size-xs va-m margin-left">{{$t('common.copy')}}</text>
+                        </view>
+                        <image v-if="(detail.extraction_data.images || null) != null" class="qrcode br radius margin-top-xs" :src="detail.extraction_data.images" mode="aspectFill"></image>
+                    </view>
+                </view>
+
                 <!-- 地址 -->
                 <view v-if="(detail.address_data || null) != null" class="address bg-white padding-horizontal-main padding-top-main border-radius-main spacing-mb">
                     <view class="address-base padding-top-xs padding-bottom oh">
@@ -100,18 +112,6 @@
                     </view>
                 </view>
 
-                <!-- 自提信息 -->
-                <view v-if="(detail.extraction_data || null) != null" class="site-extraction panel-item padding-main border-radius-main bg-white spacing-mb">
-                    <view class="br-b padding-bottom-main fw-b text-size">{{$t('user-order-detail.user-order-detail.7dikfm')}}</view>
-                    <view class="panel-content oh padding-top-main">
-                        <image v-if="(detail.extraction_data.images || null) != null" class="qrcode br radius margin-bottom-sm" :src="detail.extraction_data.images" mode="aspectFill"></image>
-                        <view>
-                            <text>{{$t('user-order-detail.user-order-detail.o38952')}}</text>
-                            <text class="radius bg-green cr-white padding-left-sm padding-right-sm">{{ detail.extraction_data.code || $t('user-order-detail.user-order-detail.hpq62x') }}</text>
-                        </view>
-                    </view>
-                </view>
-
                 <!-- 订单基础数据 -->
                 <view v-if="detail_list.length > 0" class="panel-item padding-main border-radius-main bg-white spacing-mb">
                     <view class="br-b padding-bottom-main fw-b text-size">{{$t('user-order-detail.user-order-detail.0f26j2')}}</view>