From a3f3bc3f769729a6180573a4d85032cee53e1128 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Fri, 7 Apr 2023 20:23:31 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                       |    6 +-
 changelog.md                                  |    6 +-
 components/cart/cart.vue                      |   47 +-
 .../goods-batch-buy/goods-batch-buy.vue       |   99 +-
 components/goods-buy/goods-buy.vue            |    5 -
 components/quick-nav/quick-nav.vue            |    2 +-
 pages.json                                    | 1172 +++++++++--------
 pages/cart/cart.vue                           |    4 +-
 pages/goods-category/goods-category.vue       |   28 +-
 pages/goods-detail/goods-detail.vue           |    2 +-
 pages/plugins/binding/detail/detail.vue       |   18 +-
 pages/plugins/realstore/detail/detail.vue     |   28 +-
 12 files changed, 732 insertions(+), 685 deletions(-)

diff --git a/App.vue b/App.vue
index 70c73e18..66659a7e 100644
--- a/App.vue
+++ b/App.vue
@@ -61,9 +61,9 @@
                     "/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',
                 // 基础信息
@@ -72,7 +72,7 @@
                 // 默认logo、如 /static/images/common/logo.png
                 application_logo: '',
                 // 版本号
-                version: 'v2.3.2',
+                version: 'v2.3.3',
                 // 货币价格符号
                 currency_symbol: '￥',
                 // 主题类型        主题颜色
diff --git a/changelog.md b/changelog.md
index c76bc3dc..a8d268aa 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,4 +1,4 @@
-## v2.3.3（2023-000）
+## v2.3.3（2023-04-10）
 * 商品列表使用统一组件
 * 商品参数新增弹窗展示
 * 初始访问登录页面优化
@@ -21,6 +21,10 @@
 * 新增组合搭配
 * 新增列表快捷加入购物车
 * 商品列表新增错误提示
+* 商家详情新增搜索全站开关控制
+* 门店详情新增扫码开关控制
+* 新增多规格批量下单
+* 插件分包处理
 
 
 ## v2.3.2（2022-11-30）
diff --git a/components/cart/cart.vue b/components/cart/cart.vue
index 743329d8..efdc7708 100644
--- a/components/cart/cart.vue
+++ b/components/cart/cart.vue
@@ -2,7 +2,7 @@
     <view>
         <view v-if="data_list.length > 0" class="cart-page">
             <!-- 数据列表 -->
-            <view class="padding-horizontal-main padding-top-main">
+            <view :class="'padding-horizontal-main padding-top-main '+(source_type != 'cart' ? 'bottom-line-exclude' : '')">
                 <uni-swipe-action>
                     <view v-for="(item, index) in data_list" :key="index" class="oh border-radius-main bg-white spacing-mb">
                         <uni-swipe-action-item :right-options="swipe_options" @click="swipe_opt_event" @change="swipe_change($event, index)">
@@ -59,34 +59,33 @@
             </view>
 
             <!-- 操作导航 -->
-            <view class="cart-buy-nav oh wh-auto">
-                <!-- 展示型 -->
-                <view v-if="common_site_type == 1" class="cart-exhibition-mode padding-horizontal-main">
-                    <button class="bg-main cr-white round wh-auto text-size" type="default" @tap="exhibition_submit_event" hover-class="none">
+            <!-- 展示型 -->
+            <view v-if="common_site_type == 1" :class="'cart-buy-nav oh wh-auto '+(source_type != 'cart' ? 'bottom-line-exclude' : '')">
+                <view class="cart-exhibition-mode padding-horizontal-main">
+                    <button class="bg-main cr-white round wh-auto text-size-sm" type="default" @tap="exhibition_submit_event" hover-class="none">
                         <view class="dis-inline-block va-m margin-right-xl">
                             <uni-icons type="phone" size="14" color="#fff" />
                         </view>
                         <text class="va-m">{{common_is_exhibition_mode_btn_text}}</text>
                     </button>
-                </view>
-
-                <!-- 销售,自提,虚拟销售 -->
-                <view v-else class="br-t bg-white wh-auto ht-auto">
-                    <view class="cart-nav-base fl single-text padding-left">
-                        <view @tap="selected_event" data-type="all" class="fl cart-selected">
-                            <image class="icon va-m" :src="common_static_url+'select' + (is_selected_all ? '-active' : '') + '-icon.png'" mode="widthFix"></image>
-                            <text v-if="!already_selected_status" class="va-m cr-base">全选</text>
-                        </view>
-                        <view v-if="already_selected_status" @tap="cart_all_remove_event" class="cart-nav-remove-submit pa bg-white cr-red br-red round cp">删除</view>
-                        <view class="fr price">
-                            <view class="sales-price single-text fr">{{currency_symbol}}{{total_price}}</view>
-                            <view class="fr">合计：</view>
-                        </view>
+                </view>
+            </view>
+            <!-- 销售,自提,虚拟销售 -->
+            <view v-else :class="'cart-buy-nav oh wh-auto br-t bg-white '+(source_type != 'cart' ? 'bottom-line-exclude' : '')">
+                <view class="cart-nav-base fl single-text padding-left">
+                    <view @tap="selected_event" data-type="all" class="fl cart-selected">
+                        <image class="icon va-m" :src="common_static_url+'select' + (is_selected_all ? '-active' : '') + '-icon.png'" mode="widthFix"></image>
+                        <text v-if="!already_selected_status" class="va-m cr-base">全选</text>
                     </view>
-                    <view class="fr cart-nav-submit padding-top padding-bottom padding-horizontal-main">
-                        <button class="bg-main cr-white round text-size-lg" type="default" @tap="buy_submit_event" :disabled="!already_selected_status" hover-class="none">结算</button>
+                    <view v-if="already_selected_status" @tap="cart_all_remove_event" class="cart-nav-remove-submit pa bg-white cr-red br-red round cp">删除</view>
+                    <view class="fr price">
+                        <view class="sales-price single-text fr">{{currency_symbol}}{{total_price}}</view>
+                        <view class="fr">合计：</view>
                     </view>
                 </view>
+                <view class="fr cart-nav-submit padding-top padding-bottom padding-horizontal-main">
+                    <button class="bg-main cr-white round text-size-lg" type="default" @tap="buy_submit_event" :disabled="!already_selected_status" hover-class="none">结算</button>
+                </view>
             </view>
         </view>
 
@@ -121,7 +120,8 @@
                 data_list: [],
                 total_price: '0.00',
                 is_selected_all: false,
-                already_selected_status: false,
+                already_selected_status: false,
+                source_type: null,
                 // 基础配置
                 currency_symbol: app.globalData.data.currency_symbol,
                 common_site_type: 0,
@@ -180,7 +180,8 @@
             },
 
             // 获取数据
-            init(e) {
+            init(source_type = null) {
+                this.setData({source_type: source_type});
                 var user = app.globalData.get_user_info(this, "init");
                 if (user != false) {
                     // 用户未绑定用户则转到登录页面
diff --git a/components/goods-batch-buy/goods-batch-buy.vue b/components/goods-batch-buy/goods-batch-buy.vue
index 96dc3a6b..2c50bd52 100644
--- a/components/goods-batch-buy/goods-batch-buy.vue
+++ b/components/goods-batch-buy/goods-batch-buy.vue
@@ -10,7 +10,7 @@
                 <view class="plugins-batchbuy-container oh">
                     <block v-if="(goods || null) != null && (batchbuy_data || null) != null && (batchbuy_data.goods_spec_data || null) != null && batchbuy_data.goods_spec_data.length > 0">
                         <block v-if="batchbuy_data.is_only_level_one == 0">
-                            <view class="left-nav ht-auto pa bg-base">
+                            <view class="left-nav pa bg-base">
                                 <scroll-view :scroll-y="true" class="ht-auto">
                                     <block v-for="(item, index) in batchbuy_data.goods_spec_data" :key="index">
                                         <view :class="'padding-top-xxl padding-bottom-xxl tc cp oh pr ' + (nav_active_index == index ? 'bg-white cr-main' : '')" :data-index="index" @tap="nav_event">
@@ -63,8 +63,26 @@
                                 </scroll-view>
                             </view>
                         </block>
-                        <view class="pa confirm-submit padding-horizontal-main wh-auto bs-bb bottom-line-exclude">
-                            <button type="default" class="bg-main cr-white text-size tc wh-auto round" @tap="confirm_event">{{(buy_event_type == 'buy') ? '立即购买' : '加入购物车'}}</button>
+                        <view class="confirm-submit pa wh-auto bottom-line-exclude bg-white padding-top-main">
+                            <view class="oh padding-horizontal-main padding-bottom-main cr-grey">
+                                <text class="text-size-xs">
+                                    <text>已选</text>
+                                    <text class="cr-red padding-left-xs padding-right-xs">{{base_data.kind}}</text>
+                                    <text>种</text>
+                                    <text class="cr-red padding-left-xs padding-right-xs">{{base_data.quantity}}</text>
+                                    <text>{{goods.inventory_unit}}</text>
+                                </text>
+                                <text class="text-size-xs fr">金额：<text class="fw-b sales-price">{{currency_symbol}}{{base_data.amount_money}}</text></text>
+                            </view>
+                            <view v-if="(buy_button.data || null) != null && buy_button.data.length > 0" class="padding-bottom-main">
+                                <view :class="'oh buy-nav-btn-number-' + buy_button.count || 0">
+                                    <block v-for="(item, index) in buy_button.data" :key="index">
+                                        <view v-if="(item.name || null) != null && (item.type || null) != null" class="item fl bs-bb padding-horizontal-main">
+                                            <button :class="'cr-white round text-size-sm bg-' + ((item.color || 'main') == 'main' ? 'main' : 'main-pair')" type="default" @tap="confirm_event" :data-type="item.type" hover-class="none">{{item.name}}</button>
+                                        </view>
+                                    </block>
+                                </view>
+                            </view>
                         </view>
                     </block>
                     <block v-else>
@@ -86,10 +104,15 @@
                 currency_symbol: app.globalData.get_config('currency_symbol', app.globalData.data.currency_symbol),
                 popup_status: false,
                 nav_active_index: 0,
-                buy_event_type: 'buy',
                 goods: null,
+                buy_button: null,
                 batchbuy_data: null,
-                back_data: null,
+                back_data: null,
+                base_data: {
+                    kind: 0,
+                    quantity: 0,
+                    amount_money: '0.00',
+                }
             };
         },
 
@@ -102,7 +125,7 @@
 
         methods: {
             // 初始化
-            init(goods = null, batchbuy_data = null, buy_event_type = 'buy', back_data = null) {
+            init(goods = null, batchbuy_data = null, buy_button = null, back_data = null) {
                 if(!app.globalData.is_single_page_check()) {
                     return false;
                 }
@@ -110,7 +133,7 @@
                     popup_status: true,
                     goods: goods || null,
                     batchbuy_data: batchbuy_data || null,
-                    buy_event_type: buy_event_type || 'buy',
+                    buy_button: buy_button || null,
                     back_data: back_data,
                 });
             },
@@ -196,28 +219,48 @@
                 {
                     var badge_total = 0;
                     temp_data.goods_spec_data[this.nav_active_index]['data'].forEach(item => {
-                        badge_total += parseInt(item.buy_number || 0);
+                        var temp_badge = parseInt(item.buy_number || 0);
+                        if(temp_badge > 0) {
+                            badge_total += temp_badge;
+                        }
                     });
                     temp_data.goods_spec_data[this.nav_active_index]['badge_total'] = badge_total;
                 }
 
-                // 设置数据
-                this.setData({
-                    batchbuy_data: temp_data
-                });
-
-                // 总数
+                // 总数、汇总
                 var stock_total = 0;
+                var kind_total = 0;
+                var amount_money_total = 0;
                 temp_data.goods_spec_data.forEach(item => {
                     if(parseInt(temp_data.is_only_level_one || 0) == 1) {
-                        stock_total += parseInt(item.buy_number || 0);
+                        var temp_stock = parseInt(item.buy_number || 0);
+                        if(temp_stock > 0) {
+                            stock_total += temp_stock;
+                            kind_total += 1;
+                            amount_money_total += temp_stock*parseFloat(item.base.price);
+                        }
                     } else {
                         item.data.forEach(item2 => {
-                            stock_total += parseInt(item2.buy_number || 0);
+                            var temp_stock = parseInt(item2.buy_number || 0);
+                            if(temp_stock > 0) {
+                                stock_total += temp_stock;
+                                kind_total += 1;
+                                amount_money_total += temp_stock*parseFloat(item2.base.price);
+                            }
                         });
                     }
                 });
 
+                // 设置数据
+                this.setData({
+                    batchbuy_data: temp_data,
+                    base_data: {
+                        kind: kind_total,
+                        quantity: stock_total,
+                        amount_money: app.globalData.price_two_decimal(amount_money_total)
+                    }
+                });
+
                 // 下单数据
                 var goods_data = [];
                 var goods_id = this.goods.id;
@@ -323,8 +366,8 @@
                         }
 
                         // 操作类型
-                        switch (this.buy_event_type) {
-                            case 'buy':
+                        switch (e.currentTarget.dataset.type) {
+                            case 'plugins-batchbuy-button-buy':
                                 // 进入订单确认页面
                                 var data = {
                                     buy_type: "goods",
@@ -337,7 +380,7 @@
                                 break;
 
                             // 加入购物车
-                            case 'cart':
+                            case 'plugins-batchbuy-button-cart':
                                 this.goods_cart_event(goods_data);
                                 break;
                                         
@@ -389,12 +432,13 @@
 <style>
     .plugins-batchbuy-container {
         height: 60vh;
-        padding-bottom: 100rpx;;
+        padding-bottom: 160rpx;
     }
     .plugins-batchbuy-container .left-nav {
         width: 200rpx;
         top: 0;
         left: 0;
+        height: calc(100% - 160rpx);
     }
     .plugins-batchbuy-container .left-nav .badge-icon {
         top: 8rpx;
@@ -436,6 +480,19 @@
     }
     .plugins-batchbuy-container .confirm-submit {
         left: 0;
-        bottom: 20rpx;
+        bottom: 0;
+    }
+    .plugins-batchbuy-container .buy-nav-btn-number-0 .item,
+    .plugins-batchbuy-container .buy-nav-btn-number-1 .item {
+        width: 100% !important;
+    }
+    .plugins-batchbuy-container .buy-nav-btn-number-2 .item {
+        width: 50% !important;
+    }
+    .plugins-batchbuy-container .buy-nav-btn-number-3 .item {
+        width: 33.33% !important;
+    }
+    .plugins-batchbuy-container .buy-nav-btn-number-4 .item {
+        width: 25% !important;
     }
 </style>
\ No newline at end of file
diff --git a/components/goods-buy/goods-buy.vue b/components/goods-buy/goods-buy.vue
index cb19e716..110c6541 100644
--- a/components/goods-buy/goods-buy.vue
+++ b/components/goods-buy/goods-buy.vue
@@ -627,16 +627,12 @@
                 data['goods_id'] = this.goods.id;
                 data['spec'] = JSON.stringify(spec);
                 data['stock'] = this.buy_number;
-                uni.showLoading({
-                    title: '处理中...'
-                });
                 uni.request({
                     url: app.globalData.get_request_url('save', 'cart'),
                     method: 'POST',
                     data: data,
                     dataType: 'json',
                     success: res => {
-                        uni.hideLoading();
                         if (res.data.code == 0) {
                             // 是否成功提示
                             if(this.is_success_tips == 1) {
@@ -669,7 +665,6 @@
                         }
                     },
                     fail: () => {
-                        uni.hideLoading();
                         app.globalData.showToast('服务器请求出错');
                     }
                 });
diff --git a/components/quick-nav/quick-nav.vue b/components/quick-nav/quick-nav.vue
index 133f563e..5e2dd396 100644
--- a/components/quick-nav/quick-nav.vue
+++ b/components/quick-nav/quick-nav.vue
@@ -104,7 +104,7 @@
                 is_first: 0,
                 system: system,
                 x: 12,
-                y: height - 210
+                y: height - 280
             });
         },
         methods: {
diff --git a/pages.json b/pages.json
index 9154cbe1..e1bd0e26 100644
--- a/pages.json
+++ b/pages.json
@@ -281,592 +281,596 @@
             	"enablePullDownRefresh": false,
             	"navigationBarTitleText": "账号注销"
             }
-        },
-        {
-        	"path": "pages/plugins/seckill/index/index",
-        	"style": {
-        		"enablePullDownRefresh": true,
-        		"navigationBarTitleText": "限时秒杀"
-        	}
-        },
-		{
-			"path": "pages/plugins/coupon/index/index",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "领券中心"
-			}
-		},
-        {
-        	"path": "pages/plugins/coupon/shop/shop",
-        	"style": {
-        		"enablePullDownRefresh": true,
-        		"navigationBarTitleText": "店铺领券中心"
-        	}
-        },
-		{
-			"path": "pages/plugins/coupon/user/user",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "我的卡券"
-			}
-		},
-		{
-			"path": "pages/plugins/membershiplevelvip/index/index",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "会员VIP"
-			}
-		},
-		{
-			"path": "pages/plugins/membershiplevelvip/buy/buy",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "开通会员"
-			}
-		},
-		{
-			"path": "pages/plugins/membershiplevelvip/user/user",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "我的会员"
-			}
-		},
-		{
-			"path": "pages/plugins/membershiplevelvip/order/order",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "开通订单"
-			}
-		},
-		{
-			"path": "pages/plugins/membershiplevelvip/order-detail/order-detail",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "订单详情"
-			}
-		},
-		{
-			"path": "pages/plugins/membershiplevelvip/profit/profit",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "收益明细"
-			}
-		},
-		{
-			"path": "pages/plugins/membershiplevelvip/profit-detail/profit-detail",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "收益详情"
-			}
-		},
-		{
-			"path": "pages/plugins/membershiplevelvip/statistics/statistics",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "数据统计"
-			}
-		},
-		{
-			"path": "pages/plugins/membershiplevelvip/poster/poster",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "推广返利"
-			}
-		},
-		{
-			"path": "pages/plugins/membershiplevelvip/team/team",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "我的团队"
-			}
-		},
-        {
-        	"path": "pages/plugins/membershiplevelvip/member-code/member-code",
-        	"style": {
-        		"enablePullDownRefresh": false,
-        		"navigationBarTitleText": "会员码"
-        	}
-        },
-		{
-			"path": "pages/plugins/distribution/user/user",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "我的分销"
-			}
-		},
-		{
-			"path": "pages/plugins/distribution/order/order",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "分销订单"
-			}
-		},
-		{
-			"path": "pages/plugins/distribution/order-detail/order-detail",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "订单详情"
-			}
-		},
-		{
-			"path": "pages/plugins/distribution/profit/profit",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "收益明细"
-			}
-		},
-		{
-			"path": "pages/plugins/distribution/profit-detail/profit-detail",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "收益详情"
-			}
-		},
-		{
-			"path": "pages/plugins/distribution/statistics/statistics",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "数据统计"
-			}
-		},
-		{
-			"path": "pages/plugins/distribution/poster/poster",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "推广返利"
-			}
-		},
-		{
-			"path": "pages/plugins/distribution/team/team",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "我的团队"
-			}
-		},
-		{
-			"path": "pages/plugins/distribution/extraction/extraction",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "取货点"
-			}
-		},
-		{
-			"path": "pages/plugins/distribution/extraction-apply/extraction-apply",
-			"style": {
-				"enablePullDownRefresh": false,
-				"navigationBarTitleText": "取货点信息"
-			}
-		},
-		{
-			"path": "pages/plugins/distribution/extraction-order/extraction-order",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "取货订单"
-			}
-		},
-		{
-			"path": "pages/plugins/distribution/extraction-switch/extraction-switch",
-			"style": {
-				"enablePullDownRefresh": true,
-                "navigationBarTitleText": "取货点切换"
-			}
-		},
-		{
-			"path": "pages/plugins/distribution/introduce/introduce",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "等级介绍"
-			}
-		},
-		{
-			"path": "pages/plugins/wallet/user/user",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "我的钱包"
-			}
-		},
-		{
-			"path": "pages/plugins/wallet/recharge/recharge",
-			"style": {
-				"enablePullDownRefresh": false,
-				"navigationBarTitleText": "充值"
-			}
-		},
-		{
-			"path": "pages/plugins/wallet/cash-auth/cash-auth",
-			"style": {
-				"enablePullDownRefresh": false,
-				"navigationBarTitleText": "余额提现"
-			}
-		},
-		{
-			"path": "pages/plugins/wallet/cash-create/cash-create",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "余额提现"
-			}
-		},
-		{
-			"path": "pages/plugins/wallet/wallet-log/wallet-log",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "账户明细"
-			}
-		},
-		{
-			"path": "pages/plugins/wallet/wallet-log-detail/wallet-log-detail",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "明细详情"
-			}
-		},
-		{
-			"path": "pages/plugins/wallet/user-recharge/user-recharge",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "充值记录"
-			}
-		},
-		{
-			"path": "pages/plugins/wallet/user-recharge-detail/user-recharge-detail",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "充值详情"
-			}
-		},
-		{
-			"path": "pages/plugins/wallet/user-cash/user-cash",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "提现记录"
-			}
-		},
-		{
-			"path": "pages/plugins/wallet/user-cash-detail/user-cash-detail",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "提现详情"
-			}
-		},
-        {
-        	"path": "pages/plugins/wallet/payment-code/payment-code",
-        	"style": {
-        		"enablePullDownRefresh": false,
-        		"navigationBarTitleText": "钱包付款码"
-        	}
-        },
-		{
-			"path": "pages/plugins/excellentbuyreturntocash/profit/profit",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "优购返现明细"
-			}
-		},
-		{
-			"path": "pages/plugins/excellentbuyreturntocash/profit-detail/profit-detail",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "优购返现详情"
-			}
-		},
-		{
-			"path": "pages/plugins/weixinliveplayer/index/index",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "直播"
-			}
-		},
-		{
-			"path": "pages/plugins/weixinliveplayer/search/search",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "直播列表"
-			}
-		},
-		{
-			"path": "pages/plugins/weixinliveplayer/detail/detail",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "直播详情"
-			}
-		},
-		{
-			"path": "pages/plugins/exchangerate/currency/currency",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "货币切换"
-			}
-		},
-		{
-			"path": "pages/plugins/invoice/user/user",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "我的发票"
-			}
-		},
-		{
-			"path": "pages/plugins/invoice/invoice/invoice",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "开票列表"
-			}
-		},
-		{
-			"path": "pages/plugins/invoice/invoice-detail/invoice-detail",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "发票详情"
-			}
-		},
-		{
-			"path": "pages/plugins/invoice/invoice-saveinfo/invoice-saveinfo",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "开票编辑"
-			}
-		},
-		{
-			"path": "pages/plugins/invoice/order/order",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "订单开票"
-			}
-		},
-		{
-			"path": "pages/plugins/signin/user/user",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "签到"
-			}
-		},
-		{
-			"path": "pages/plugins/signin/index-detail/index-detail",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "签到"
-			}
-		},
-		{
-			"path": "pages/plugins/signin/user-signin/user-signin",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "我的签到"
-			}
-		},
-		{
-			"path": "pages/plugins/signin/user-qrcode/user-qrcode",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "签到码管理"
-			}
-		},
-		{
-			"path": "pages/plugins/signin/user-qrcode-detail/user-qrcode-detail",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "签到码详情"
-			}
-		},
-		{
-			"path": "pages/plugins/signin/user-qrcode-saveinfo/user-qrcode-saveinfo",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "签到码编辑"
-			}
-		},
-		{
-			"path": "pages/plugins/signin/user-coming-list/user-coming-list",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "用户签到"
-			}
-		},
-		{
-			"path": "pages/plugins/points/index/index",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "积分商城"
-			}
-		},
-		{
-			"path": "pages/plugins/brand/index/index",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "品牌"
-			}
-		},
-		{
-			"path": "pages/plugins/shop/index/index",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "所有店铺"
-			}
-		},
-		{
-			"path": "pages/plugins/shop/detail/detail",
-			"style": {
-				"enablePullDownRefresh": true,
-                "navigationBarTitleText": "店铺首页"
-			}
-		},
-		{
-			"path": "pages/plugins/shop/search/search",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "店铺商品搜索"
-			}
-		},
-		{
-			"path": "pages/plugins/shop/design/design",
-			"style": {
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/plugins/shop/favor/favor",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "店铺收藏"
-			}
-		},
-        {
-        	"path": "pages/plugins/activity/index/index",
-        	"style": {
-        		"enablePullDownRefresh": true,
-        		"navigationBarTitleText": "所有活动"
-        	}
-        },
-        {
-        	"path": "pages/plugins/activity/detail/detail",
-        	"style": {
-        		"enablePullDownRefresh": true,
-        		"navigationBarTitleText": "活动详情"
-        	}
-        },
-        {
-        	"path": "pages/plugins/label/detail/detail",
-        	"style": {
-        		"enablePullDownRefresh": true,
-        		"navigationBarTitleText": "标签详情"
-        	}
-        },
-        {
-        	"path": "pages/plugins/blog/index/index",
-        	"style": {
-        		"enablePullDownRefresh": true,
-        		"navigationBarTitleText": "博客"
-        	}
-        },
-        {
-        	"path": "pages/plugins/blog/search/search",
-        	"style": {
-        		"enablePullDownRefresh": true,
-        		"navigationBarTitleText": "博文搜索"
-        	}
-        },
-        {
-        	"path": "pages/plugins/blog/detail/detail",
-        	"style": {
-        		"enablePullDownRefresh": true,
-        		"navigationBarTitleText": "博文详情"
-        	}
-        },
-        {
-        	"path": "pages/plugins/blog/comments/comments",
-        	"style": {
-        		"enablePullDownRefresh": true,
-        		"navigationBarTitleText": "评论列表"
-        	}
-        },
-        {
-        	"path": "pages/plugins/express/detail/detail",
-        	"style": {
-        		"enablePullDownRefresh": true,
-        		"navigationBarTitleText": "物流详情"
-        	}
-        },
-        {
-            "path": "pages/plugins/realstore/index/index",
-            "style": {
-            	"enablePullDownRefresh": true,
-            	"navigationBarTitleText": "门店"
-            }
-        },
-        {
-            "path": "pages/plugins/realstore/search/search",
-            "style": {
-            	"enablePullDownRefresh": true,
-            	"navigationBarTitleText": "门店搜索"
-            }
-        },
-        {
-        	"path": "pages/plugins/realstore/detail/detail",
-        	"style": {
-                // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU
-                "navigationStyle": "custom",
-                // #endif
-                "enablePullDownRefresh": true,
-                "navigationBarTitleText": "门店详情"
-            }
-        },
-        {
-            "path": "pages/plugins/realstore/favor/favor",
-            "style": {
-            	"enablePullDownRefresh": true,
-            	"navigationBarTitleText": "门店收藏"
-            }
-        },
-        {
-            "path": "pages/plugins/realstore/orderallot-list/orderallot-list",
-            "style": {
-            	"enablePullDownRefresh": true,
-            	"navigationBarTitleText": "子订单列表"
-            }
-        },
-        {
-            "path": "pages/plugins/realstore/orderallot-detail/orderallot-detail",
-            "style": {
-            	"enablePullDownRefresh": true,
-            	"navigationBarTitleText": "子订单详情"
-            }
-        },
-        {
-            "path": "pages/plugins/realstore/batchorder-list/batchorder-list",
-            "style": {
-            	"enablePullDownRefresh": true,
-            	"navigationBarTitleText": "批次订单"
-            }
-        },
-        {
-            "path": "pages/plugins/realstore/frequencycard-list/frequencycard-list",
-            "style": {
-            	"enablePullDownRefresh": true,
-            	"navigationBarTitleText": "次卡"
-            }
-        },
-        {
-            "path": "pages/plugins/realstore/frequencycard-used/frequencycard-used",
-            "style": {
-            	"enablePullDownRefresh": true,
-            	"navigationBarTitleText": "次卡使用记录"
-            }
-        },
-        {
-            "path": "pages/plugins/binding/index/index",
-            "style": {
-            	"enablePullDownRefresh": true,
-            	"navigationBarTitleText": "组合搭配"
-            }
-        },
-        {
-            "path": "pages/plugins/binding/detail/detail",
-            "style": {
-            	"enablePullDownRefresh": true,
-            	"navigationBarTitleText": "组合搭配详情"
-            }
         }
 	],
-    "subPackages": [],
+    "subPackages": [{
+        "root": "pages/plugins",
+        "pages": [
+            {
+            	"path": "seckill/index/index",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "限时秒杀"
+            	}
+            },
+            {
+            	"path": "coupon/index/index",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "领券中心"
+            	}
+            },
+            {
+            	"path": "coupon/shop/shop",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "店铺领券中心"
+            	}
+            },
+            {
+            	"path": "coupon/user/user",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "我的卡券"
+            	}
+            },
+            {
+            	"path": "membershiplevelvip/index/index",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "会员VIP"
+            	}
+            },
+            {
+            	"path": "membershiplevelvip/buy/buy",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "开通会员"
+            	}
+            },
+            {
+            	"path": "membershiplevelvip/user/user",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "我的会员"
+            	}
+            },
+            {
+            	"path": "membershiplevelvip/order/order",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "开通订单"
+            	}
+            },
+            {
+            	"path": "membershiplevelvip/order-detail/order-detail",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "订单详情"
+            	}
+            },
+            {
+            	"path": "membershiplevelvip/profit/profit",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "收益明细"
+            	}
+            },
+            {
+            	"path": "membershiplevelvip/profit-detail/profit-detail",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "收益详情"
+            	}
+            },
+            {
+            	"path": "membershiplevelvip/statistics/statistics",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "数据统计"
+            	}
+            },
+            {
+            	"path": "membershiplevelvip/poster/poster",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "推广返利"
+            	}
+            },
+            {
+            	"path": "membershiplevelvip/team/team",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "我的团队"
+            	}
+            },
+            {
+            	"path": "membershiplevelvip/member-code/member-code",
+            	"style": {
+            		"enablePullDownRefresh": false,
+            		"navigationBarTitleText": "会员码"
+            	}
+            },
+            {
+            	"path": "distribution/user/user",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "我的分销"
+            	}
+            },
+            {
+            	"path": "distribution/order/order",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "分销订单"
+            	}
+            },
+            {
+            	"path": "distribution/order-detail/order-detail",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "订单详情"
+            	}
+            },
+            {
+            	"path": "distribution/profit/profit",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "收益明细"
+            	}
+            },
+            {
+            	"path": "distribution/profit-detail/profit-detail",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "收益详情"
+            	}
+            },
+            {
+            	"path": "distribution/statistics/statistics",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "数据统计"
+            	}
+            },
+            {
+            	"path": "distribution/poster/poster",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "推广返利"
+            	}
+            },
+            {
+            	"path": "distribution/team/team",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "我的团队"
+            	}
+            },
+            {
+            	"path": "distribution/extraction/extraction",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "取货点"
+            	}
+            },
+            {
+            	"path": "distribution/extraction-apply/extraction-apply",
+            	"style": {
+            		"enablePullDownRefresh": false,
+            		"navigationBarTitleText": "取货点信息"
+            	}
+            },
+            {
+            	"path": "distribution/extraction-order/extraction-order",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "取货订单"
+            	}
+            },
+            {
+            	"path": "distribution/extraction-switch/extraction-switch",
+            	"style": {
+            		"enablePullDownRefresh": true,
+                    "navigationBarTitleText": "取货点切换"
+            	}
+            },
+            {
+            	"path": "distribution/introduce/introduce",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "等级介绍"
+            	}
+            },
+            {
+            	"path": "wallet/user/user",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "我的钱包"
+            	}
+            },
+            {
+            	"path": "wallet/recharge/recharge",
+            	"style": {
+            		"enablePullDownRefresh": false,
+            		"navigationBarTitleText": "充值"
+            	}
+            },
+            {
+            	"path": "wallet/cash-auth/cash-auth",
+            	"style": {
+            		"enablePullDownRefresh": false,
+            		"navigationBarTitleText": "余额提现"
+            	}
+            },
+            {
+            	"path": "wallet/cash-create/cash-create",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "余额提现"
+            	}
+            },
+            {
+            	"path": "wallet/wallet-log/wallet-log",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "账户明细"
+            	}
+            },
+            {
+            	"path": "wallet/wallet-log-detail/wallet-log-detail",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "明细详情"
+            	}
+            },
+            {
+            	"path": "wallet/user-recharge/user-recharge",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "充值记录"
+            	}
+            },
+            {
+            	"path": "wallet/user-recharge-detail/user-recharge-detail",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "充值详情"
+            	}
+            },
+            {
+            	"path": "wallet/user-cash/user-cash",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "提现记录"
+            	}
+            },
+            {
+            	"path": "wallet/user-cash-detail/user-cash-detail",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "提现详情"
+            	}
+            },
+            {
+            	"path": "wallet/payment-code/payment-code",
+            	"style": {
+            		"enablePullDownRefresh": false,
+            		"navigationBarTitleText": "钱包付款码"
+            	}
+            },
+            {
+            	"path": "excellentbuyreturntocash/profit/profit",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "优购返现明细"
+            	}
+            },
+            {
+            	"path": "excellentbuyreturntocash/profit-detail/profit-detail",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "优购返现详情"
+            	}
+            },
+            {
+            	"path": "weixinliveplayer/index/index",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "直播"
+            	}
+            },
+            {
+            	"path": "weixinliveplayer/search/search",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "直播列表"
+            	}
+            },
+            {
+            	"path": "weixinliveplayer/detail/detail",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "直播详情"
+            	}
+            },
+            {
+            	"path": "exchangerate/currency/currency",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "货币切换"
+            	}
+            },
+            {
+            	"path": "invoice/user/user",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "我的发票"
+            	}
+            },
+            {
+            	"path": "invoice/invoice/invoice",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "开票列表"
+            	}
+            },
+            {
+            	"path": "invoice/invoice-detail/invoice-detail",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "发票详情"
+            	}
+            },
+            {
+            	"path": "invoice/invoice-saveinfo/invoice-saveinfo",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "开票编辑"
+            	}
+            },
+            {
+            	"path": "invoice/order/order",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "订单开票"
+            	}
+            },
+            {
+            	"path": "signin/user/user",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "签到"
+            	}
+            },
+            {
+            	"path": "signin/index-detail/index-detail",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "签到"
+            	}
+            },
+            {
+            	"path": "signin/user-signin/user-signin",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "我的签到"
+            	}
+            },
+            {
+            	"path": "signin/user-qrcode/user-qrcode",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "签到码管理"
+            	}
+            },
+            {
+            	"path": "signin/user-qrcode-detail/user-qrcode-detail",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "签到码详情"
+            	}
+            },
+            {
+            	"path": "signin/user-qrcode-saveinfo/user-qrcode-saveinfo",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "签到码编辑"
+            	}
+            },
+            {
+            	"path": "signin/user-coming-list/user-coming-list",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "用户签到"
+            	}
+            },
+            {
+            	"path": "points/index/index",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "积分商城"
+            	}
+            },
+            {
+            	"path": "brand/index/index",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "品牌"
+            	}
+            },
+            {
+            	"path": "shop/index/index",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "所有店铺"
+            	}
+            },
+            {
+            	"path": "shop/detail/detail",
+            	"style": {
+            		"enablePullDownRefresh": true,
+                    "navigationBarTitleText": "店铺首页"
+            	}
+            },
+            {
+            	"path": "shop/search/search",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "店铺商品搜索"
+            	}
+            },
+            {
+            	"path": "shop/design/design",
+            	"style": {
+            		"enablePullDownRefresh": true
+            	}
+            },
+            {
+            	"path": "shop/favor/favor",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "店铺收藏"
+            	}
+            },
+            {
+            	"path": "activity/index/index",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "所有活动"
+            	}
+            },
+            {
+            	"path": "activity/detail/detail",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "活动详情"
+            	}
+            },
+            {
+            	"path": "label/detail/detail",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "标签详情"
+            	}
+            },
+            {
+            	"path": "blog/index/index",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "博客"
+            	}
+            },
+            {
+            	"path": "blog/search/search",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "博文搜索"
+            	}
+            },
+            {
+            	"path": "blog/detail/detail",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "博文详情"
+            	}
+            },
+            {
+            	"path": "blog/comments/comments",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "评论列表"
+            	}
+            },
+            {
+            	"path": "express/detail/detail",
+            	"style": {
+            		"enablePullDownRefresh": true,
+            		"navigationBarTitleText": "物流详情"
+            	}
+            },
+            {
+                "path": "realstore/index/index",
+                "style": {
+                	"enablePullDownRefresh": true,
+                	"navigationBarTitleText": "门店"
+                }
+            },
+            {
+                "path": "realstore/search/search",
+                "style": {
+                	"enablePullDownRefresh": true,
+                	"navigationBarTitleText": "门店搜索"
+                }
+            },
+            {
+            	"path": "realstore/detail/detail",
+            	"style": {
+                    // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU
+                    "navigationStyle": "custom",
+                    // #endif
+                    "enablePullDownRefresh": true,
+                    "navigationBarTitleText": "门店详情"
+                }
+            },
+            {
+                "path": "realstore/favor/favor",
+                "style": {
+                	"enablePullDownRefresh": true,
+                	"navigationBarTitleText": "门店收藏"
+                }
+            },
+            {
+                "path": "realstore/orderallot-list/orderallot-list",
+                "style": {
+                	"enablePullDownRefresh": true,
+                	"navigationBarTitleText": "子订单列表"
+                }
+            },
+            {
+                "path": "realstore/orderallot-detail/orderallot-detail",
+                "style": {
+                	"enablePullDownRefresh": true,
+                	"navigationBarTitleText": "子订单详情"
+                }
+            },
+            {
+                "path": "realstore/batchorder-list/batchorder-list",
+                "style": {
+                	"enablePullDownRefresh": true,
+                	"navigationBarTitleText": "批次订单"
+                }
+            },
+            {
+                "path": "realstore/frequencycard-list/frequencycard-list",
+                "style": {
+                	"enablePullDownRefresh": true,
+                	"navigationBarTitleText": "次卡"
+                }
+            },
+            {
+                "path": "realstore/frequencycard-used/frequencycard-used",
+                "style": {
+                	"enablePullDownRefresh": true,
+                	"navigationBarTitleText": "次卡使用记录"
+                }
+            },
+            {
+                "path": "binding/index/index",
+                "style": {
+                	"enablePullDownRefresh": true,
+                	"navigationBarTitleText": "组合搭配"
+                }
+            },
+            {
+                "path": "binding/detail/detail",
+                "style": {
+                	"enablePullDownRefresh": true,
+                	"navigationBarTitleText": "组合搭配详情"
+                }
+            }
+        ]
+    }],
 	"globalStyle": {
 		"navigationBarTitleText": "ShopXO",
         "navigationBarTextStyle": "black",
diff --git a/pages/cart/cart.vue b/pages/cart/cart.vue
index 1ac618a2..60b2329c 100644
--- a/pages/cart/cart.vue
+++ b/pages/cart/cart.vue
@@ -23,13 +23,13 @@
         onShow() {
             // 数据加载
             if((this.$refs.cart || null) != null) {
-                this.$refs.cart.init();
+                this.$refs.cart.init('cart');
             }
         },
 
         // 下拉刷新
         onPullDownRefresh() {
-            this.$refs.cart.init();
+            this.$refs.cart.init('cart');
         },
 
         methods: {}
diff --git a/pages/goods-category/goods-category.vue b/pages/goods-category/goods-category.vue
index bd9e436f..3decb941 100644
--- a/pages/goods-category/goods-category.vue
+++ b/pages/goods-category/goods-category.vue
@@ -778,7 +778,16 @@
                         if(res === false) {
                             return false;
                         }
-                        
+
+                        // 数据临时记录
+                        this.setData({
+                            temp_opt_data: {
+                                pos: e,
+                                goods: temp_goods,
+                                type: type,
+                            }
+                        });
+
                         // 操作类型
                         if(res == 0) {
                             this.cart_delete(temp_goods['id']);
@@ -855,9 +864,6 @@
 
             // 购物车添加
             cart_save(goods_id, buy_number, spec = '') {
-                uni.showLoading({
-                    title: '处理中...'
-                });
                 uni.request({
                     url: app.globalData.get_request_url('save', 'cart'),
                     method: 'POST',
@@ -868,7 +874,6 @@
                     },
                     dataType: 'json',
                     success: res => {
-                        uni.hideLoading();
                         if (res.data.code == 0) {
                             this.cart_para_curve_handle();
                             this.get_cart_data();
@@ -879,7 +884,6 @@
                         }
                     },
                     fail: () => {
-                        uni.hideLoading();
                         app.globalData.showToast('服务器请求出错');
                     }
                 });
@@ -887,10 +891,6 @@
 
             // 购物车更新
             cart_update(cart_id, goods_id, buy_number) {
-                uni.showLoading({
-                    title: '处理中...',
-                    mask: true
-                });
                 uni.request({
                     url: app.globalData.get_request_url("stock", "cart"),
                     method: 'POST',
@@ -901,7 +901,6 @@
                     },
                     dataType: 'json',
                     success: res => {
-                        uni.hideLoading();
                         if (res.data.code == 0) {
                             this.cart_para_curve_handle();
                             this.get_cart_data();
@@ -914,7 +913,6 @@
                         }
                     },
                     fail: () => {
-                        uni.hideLoading();
                         app.globalData.showToast('服务器请求出错');
                     }
                 });
@@ -922,10 +920,6 @@
 
             // 购物车删除
             cart_delete(cart_id) {
-                uni.showLoading({
-                    title: '处理中...',
-                    mask: true
-                });
                 uni.request({
                     url: app.globalData.get_request_url('delete', 'cart'),
                     method: 'POST',
@@ -934,7 +928,6 @@
                     },
                     dataType: 'json',
                     success: res => {
-                        uni.hideLoading();
                         if (res.data.code == 0) {
                             this.get_cart_data();
                         } else {
@@ -946,7 +939,6 @@
                         }
                     },
                     fail: () => {
-                        uni.hideLoading();
                         app.globalData.showToast('服务器请求出错');
                     }
                 });
diff --git a/pages/goods-detail/goods-detail.vue b/pages/goods-detail/goods-detail.vue
index 0dd72725..eaaac337 100644
--- a/pages/goods-detail/goods-detail.vue
+++ b/pages/goods-detail/goods-detail.vue
@@ -1043,7 +1043,7 @@
                     // 商品批量下单-加入购物车
                     case 'plugins-batchbuy-button-cart' :
                         if((this.$refs.goods_batch_buy || null) != null) {
-                            this.$refs.goods_batch_buy.init(this.goods, this.plugins_batchbuy_data, type.replace('plugins-batchbuy-button-', ''));
+                            this.$refs.goods_batch_buy.init(this.goods, this.plugins_batchbuy_data, this.buy_button);
                         }
                         break;
                     // 默认
diff --git a/pages/plugins/binding/detail/detail.vue b/pages/plugins/binding/detail/detail.vue
index fbb2001c..6bb32a47 100644
--- a/pages/plugins/binding/detail/detail.vue
+++ b/pages/plugins/binding/detail/detail.vue
@@ -40,15 +40,17 @@
 
                     <!-- 导航 -->
                     <view class="nav-button bottom-fixed padding-main pr">
-                        <view class="left-price fl">
-                            <view v-if="data.estimate_discount_price != 0" class="pa single-text estimate-discount-price">
-                                <text class="discount-icon cr-white text-size-xs">节省</text>
-                                <text class="cr-green">{{currency_symbol}}{{data.estimate_discount_price}}</text>
+                        <view class="bottom-line-exclude oh">
+                            <view class="left-price fl">
+                                <view v-if="data.estimate_discount_price != 0" class="pa single-text estimate-discount-price">
+                                    <text class="discount-icon cr-white text-size-xs">节省</text>
+                                    <text class="cr-green">{{currency_symbol}}{{data.estimate_discount_price}}</text>
+                                </view>
+                                <view :class="'sales-price single-text margin-top-'+(data.estimate_discount_price == 0 ? 'sm' : 'xl')">{{currency_symbol}}{{data.estimate_price}}</view>
+                            </view>
+                            <view class="right-button fr tr">
+                                <button type="default" size="mini" class="bg-main br-main cr-white round dis-block text-size-sm" @tap="buy_event">立即购买</button>
                             </view>
-                            <view :class="'sales-price single-text margin-top-'+(data.estimate_discount_price == 0 ? 'sm' : 'xl')">{{currency_symbol}}{{data.estimate_price}}</view>
-                        </view>
-                        <view class="right-button fr tr">
-                            <button type="default" size="mini" class="bg-main br-main cr-white round dis-block text-size-sm" @tap="buy_event">立即购买</button>
                         </view>
                     </view>
                 </view>
diff --git a/pages/plugins/realstore/detail/detail.vue b/pages/plugins/realstore/detail/detail.vue
index 1bd6b96d..5df7b446 100644
--- a/pages/plugins/realstore/detail/detail.vue
+++ b/pages/plugins/realstore/detail/detail.vue
@@ -713,7 +713,16 @@
                         if(res === false) {
                             return false;
                         }
-                        
+
+                        // 数据临时记录
+                        this.setData({
+                            temp_opt_data: {
+                                pos: e,
+                                goods: temp_goods,
+                                type: type,
+                            }
+                        });
+
                         // 操作类型
                         if(res == 0) {
                             this.cart_delete(temp_goods['id']);
@@ -815,9 +824,6 @@
             
             // 购物车添加
             cart_save(goods_id, buy_number, spec = '') {
-                uni.showLoading({
-                    title: '处理中...'
-                });
                 uni.request({
                     url: app.globalData.get_request_url('save', 'cart'),
                     method: 'POST',
@@ -828,7 +834,6 @@
                     },
                     dataType: 'json',
                     success: res => {
-                        uni.hideLoading();
                         if (res.data.code == 0) {
                             this.cart_para_curve_handle();
                             this.get_cart_data();
@@ -839,7 +844,6 @@
                         }
                     },
                     fail: () => {
-                        uni.hideLoading();
                         app.globalData.showToast('服务器请求出错');
                     }
                 });
@@ -847,10 +851,6 @@
 
             // 购物车更新
             cart_update(cart_id, goods_id, buy_number) {
-                uni.showLoading({
-                    title: '处理中...',
-                    mask: true
-                });
                 uni.request({
                     url: app.globalData.get_request_url("stock", "cart"),
                     method: 'POST',
@@ -861,7 +861,6 @@
                     },
                     dataType: 'json',
                     success: res => {
-                        uni.hideLoading();
                         if (res.data.code == 0) {
                             this.cart_para_curve_handle();
                             this.get_cart_data();
@@ -874,7 +873,6 @@
                         }
                     },
                     fail: () => {
-                        uni.hideLoading();
                         app.globalData.showToast('服务器请求出错');
                     }
                 });
@@ -882,10 +880,6 @@
 
             // 购物车删除
             cart_delete(cart_id) {
-                uni.showLoading({
-                    title: '处理中...',
-                    mask: true
-                });
                 uni.request({
                     url: app.globalData.get_request_url('delete', 'cart'),
                     method: 'POST',
@@ -894,7 +888,6 @@
                     },
                     dataType: 'json',
                     success: res => {
-                        uni.hideLoading();
                         if (res.data.code == 0) {
                             this.get_cart_data();
                         } else {
@@ -906,7 +899,6 @@
                         }
                     },
                     fail: () => {
-                        uni.hideLoading();
                         app.globalData.showToast('服务器请求出错');
                     }
                 });