diff --git a/App.vue b/App.vue
index 603e4e52..38402a7d 100644
--- a/App.vue
+++ b/App.vue
@@ -1,222 +1,231 @@
 <script>
-	import base64 from './common/js/lib/base64.js';
-	export default {
-		globalData: {
-			data: {
-				// 场景值
-				cache_scene_key: "cache_scene_key",
-				// uuid缓存key
-				cache_user_uuid_key: "cache_user_uuid_key",
-				// 配置信息缓存key
-				cache_config_info_key: "cache_config_info_key",
-				// 用户登录缓存key
-				cache_user_login_key: "cache_user_login_key",
-				// 用户信息缓存key
-				cache_user_info_key: "cache_shop_user_info_key",
-				// 设备信息缓存key
-				cache_system_info_key: "cache_shop_system_info_key",
-				// 用户地址选择缓存key
-				cache_buy_user_address_select_key: "cache_buy_user_address_select_key",
-				// 启动参数缓存key
-				cache_launch_info_key: "cache_shop_launch_info_key",
-				// 获取位置选择缓存key
-				cache_userlocation_key: "cache_userlocation_key",
-				// 页面支付临时缓存key
-				cache_page_pay_key: "cache_page_pay_key",
-				// 上一页地址缓存key
-				cache_prev_page_key: 'cache_prev_page_key',
+    import base64 from './common/js/lib/base64.js';
+    export default {
+        globalData: {
+            data: {
+                // 场景值
+                cache_scene_key: "cache_scene_key",
+                // uuid缓存key
+                cache_user_uuid_key: "cache_user_uuid_key",
+                // 配置信息缓存key
+                cache_config_info_key: "cache_config_info_key",
+                // 用户登录缓存key
+                cache_user_login_key: "cache_user_login_key",
+                // 用户信息缓存key
+                cache_user_info_key: "cache_shop_user_info_key",
+                // 设备信息缓存key
+                cache_system_info_key: "cache_shop_system_info_key",
+                // 用户地址选择缓存key
+                cache_buy_user_address_select_key: "cache_buy_user_address_select_key",
+                // 启动参数缓存key
+                cache_launch_info_key: "cache_shop_launch_info_key",
+                // 获取位置选择缓存key
+                cache_userlocation_key: "cache_userlocation_key",
+                // 页面支付临时缓存key
+                cache_page_pay_key: "cache_page_pay_key",
+                // 上一页地址缓存key
+                cache_prev_page_key: 'cache_prev_page_key',
 				// tab页面切换参数
 				cache_page_tabbar_switch_params: 'cache_page_tabbar_switch_params_key',
-				// 用户基础资料提示间隔key
-				cache_user_base_personal_interval_time_key: 'cache_user_base_personal_interval_time_key',
-				// 用户购物车选择记录key
-				cache_user_cart_not_use_data_key: 'cache_user_cart_not_use_data_key',
-				// 默认用户头像
-				default_user_head_src: "/static/images/common/user.png",
-				// 成功圆形提示图片
-				default_round_success_icon: "/static/images/common/round-success-icon.png",
-				// 错误圆形提示图片
-				default_round_error_icon: "/static/images/common/round-error-icon.png",
-				// 分享及转发使用页面设置的默认图片及系统默认图片（0 否, 1 是）
-				is_share_use_image: 1,
-				// 商品详情页底部导航是否开启购物车功能（0 否, 1 是）
-				is_goods_bottom_opt_cart: 1,
-				// 商品详情页底部导航存在指定返回参数[is_opt_back=1]展示返回按钮（0 否, 1 是）
-				is_goods_bottom_opt_back: 1,
-				// 门店详情顶部导航返回按钮（0 否, 1 是）
-				is_realstore_top_nav_back: 1,
-				// 门店详情搜索框内扫码加购（0否, 1是）
-				is_realstore_top_search_scan: 1,
-				// 开启浮动客服、前提是后台需要开启客服功能（0 否, 1 是）
-				is_online_service_fixed: 1,
-				// 分类页面商品列表模式一级分类使用图标类型（0 实景图, 1 icon图标, 2 大图片）
-				category_goods_model_icon_type: 0,
-				// 强制使用文字作为logo（默认当前指定logo->后台站点设置手机端图片logo->后台手机管理小程序配置名称->站点设置中的站点名称）
-				is_logo_use_text: 0,
+                // 用户基础资料提示间隔key
+                cache_user_base_personal_interval_time_key: 'cache_user_base_personal_interval_time_key',
+                // 用户购物车选择记录key
+                cache_user_cart_not_use_data_key: 'cache_user_cart_not_use_data_key',
+                // 默认用户头像
+                default_user_head_src: "/static/images/common/user.png",
+                // 成功圆形提示图片
+                default_round_success_icon: "/static/images/common/round-success-icon.png",
+                // 错误圆形提示图片
+                default_round_error_icon: "/static/images/common/round-error-icon.png",
+                // 分享及转发使用页面设置的默认图片及系统默认图片（0 否, 1 是）
+                is_share_use_image: 1,
+                // 商品详情页底部导航是否开启购物车功能（0 否, 1 是）
+                is_goods_bottom_opt_cart: 1,
+                // 商品详情页底部导航存在指定返回参数[is_opt_back=1]展示返回按钮（0 否, 1 是）
+                is_goods_bottom_opt_back: 1,
+                // 门店详情顶部导航返回按钮（0 否, 1 是）
+                is_realstore_top_nav_back: 1,
+                // 门店详情搜索框内扫码加购（0否, 1是）
+                is_realstore_top_search_scan: 1,
+                // 开启浮动客服、前提是后台需要开启客服功能（0 否, 1 是）
+                is_online_service_fixed: 1,
+                // 分类页面商品列表模式一级分类使用图标类型（0 实景图, 1 icon图标, 2 大图片）
+                category_goods_model_icon_type: 0,
+                // 强制使用文字作为logo（默认当前指定logo->后台站点设置手机端图片logo->后台手机管理小程序配置名称->站点设置中的站点名称）
+                is_logo_use_text: 0,
 				// 用户中心菜单默认展示模式（0 九方格, 1 列表）
 				user_center_nav_show_model_type: 0,
-				// 商品列表是否展示购物车（0否, 1是）
-				is_goods_list_show_cart_opt: 1,
-				// 商品分类页面搜索进入独立搜索页面（0否, 1是）
-				is_goods_category_search_alone: 0,
-				// 分销页面地图分布是否强制获取当前位置（0否, 1是）
-				is_distribution_map_force_location: 0,
-				// tabbar页面
-				tabbar_pages: [
-					"/pages/index/index",
-					"/pages/goods-category/goods-category",
-					"/pages/cart/cart",
-					"/pages/user/user"
-				],
-				// 请求地址
-				// request_url: 'https://d1.shopxo.vip/',
-				request_url: 'http://shopxo.com/',
-				// 静态资源地址（如系统根目录不在public目录下面请在静态地址后面加public目录、如：https://d1.shopxo.vip/public/）
-				// static_url: 'https://d1.shopxo.vip/',
-				static_url: 'http://shopxo.com/',
-				// 系统类型（默认default、如额外独立小程序、可与程序分身插件实现不同主体小程序及支付独立）
-				system_type: 'default',
-				// 基础信息
-				application_title: 'ShopXO',
-				application_describe: '企业级B2C开源电商系统！',
-				// 默认logo、如 /static/images/common/logo.png
-				application_logo: '',
-				// 版本号
-				version: 'v3.0.0',
-				// 货币价格符号
-				currency_symbol: '￥',
-			},
+                // 商品列表是否展示购物车（0否, 1是）
+                is_goods_list_show_cart_opt: 1,
+                // 商品分类页面搜索进入独立搜索页面（0否, 1是）
+                is_goods_category_search_alone: 0,
+                // 分销页面地图分布是否强制获取当前位置（0否, 1是）
+                is_distribution_map_force_location: 0,
+                // 是否开启微信隐私弹窗授权提示、仅首页展示（0否, 1是）
+                is_weixin_privacy_setting: 1,
+                weixin_privacy_setting_timer: null,
+                // tabbar页面
+                tabbar_pages: [
+                    "/pages/index/index",
+                    "/pages/goods-category/goods-category",
+                    "/pages/cart/cart",
+                    "/pages/user/user"
+                ],
+                // 请求地址
+                request_url: 'https://d1.shopxo.vip/',
+                // 静态资源地址（如系统根目录不在public目录下面请在静态地址后面加public目录、如：https://d1.shopxo.vip/public/）
+                static_url: 'https://d1.shopxo.vip/',
+                // 系统类型（默认default、如额外独立小程序、可与程序分身插件实现不同主体小程序及支付独立）
+                system_type: 'default',
+                // 基础信息
+                application_title: 'ShopXO',
+                application_describe: '企业级B2C开源电商系统！',
+                // 默认logo、如 /static/images/common/logo.png
+                application_logo: '',
+                // 版本号
+                version: 'v3.0.2',
+                // 货币价格符号
+                currency_symbol: '￥',
+                // 主题类型        主题颜色
+                // 黄色 yellow    #f6c133
+                // 红色 red       #ff0036
+                // 黑色 black     #333333
+                // 绿色 green     #20a53a
+                // 橙色 orange    #fe6f04
+                // 蓝色 blue      #1677ff
+                // 棕色 brown     #8B4513
+                // 紫色 purple    #623cec
+                default_theme: 'yellow'
+            },
 
-			/**
-			 * 启动参数处理
-			 */
-			launch_params_handle(params) {
-				// 原有缓存
-				var cache_params = this.get_launch_cache_info();
+            /**
+             * 启动参数处理
+             */
+            launch_params_handle(params) {
+                // 原有缓存
+                var cache_params = this.get_launch_cache_info();
 
-				// 当前参数、从query读取覆盖
-				if ((params.query || null) != null) {
-					params = params.query;
-				}
-				// query下scene参数解析处理
-				if ((params.scene || null) != null) {
-					params = this.url_params_to_json(decodeURIComponent(params.scene));
-				}
+                // 当前参数、从query读取覆盖
+                if ((params.query || null) != null) {
+                    params = params.query;
+                }
+                // query下scene参数解析处理
+                if ((params.scene || null) != null) {
+                    params = this.url_params_to_json(decodeURIComponent(params.scene));
+                }
+                
+                // 原始缓存是否存在邀请id、邀请使用最开始的用户id
+                if((params['referrer'] || null) == null && cache_params != null && (cache_params.referrer || null) != null) {
+                    params['referrer'] = cache_params.referrer;
+                }
 
-				// 原始缓存是否存在邀请id、邀请使用最开始的用户id
-				if ((params['referrer'] || null) == null && cache_params != null && (cache_params.referrer || null) !=
-					null) {
-					params['referrer'] = cache_params.referrer;
-				}
+                return params;
+            },
+            
+            /**
+             * 当前是否单页模式
+             */
+            is_current_single_page() {
+                var scene = this.get_scene_data();
+                // #ifdef MP-WEIXIN
+                return (scene == 1154) ? 1 : 0;
+                // #endif
+                return 0;
+            },
+            
+            /**
+             * 场景值获取
+             */
+            get_scene_data() {
+                return uni.getStorageSync(this.data.cache_scene_key) || 0;
+            },
+            
+            /**
+             * 场景值设置
+             */
+            set_scene_data(params) {
+                var scene = ((params.scene || null) == null) ? 0 : parseInt(params.scene);
+                uni.setStorageSync(this.data.cache_scene_key, scene);
+                return scene;
+            },
 
-				return params;
-			},
+            /**
+             * 获取设备信息
+             * key      指定key
+             * dv       默认数据（不存在则读取、默认null）
+             * is_real  是否实时读取
+             */
+            get_system_info(key, dv, is_real) {
+                var info = null;
+                if((is_real || false) == true) {
+                    info = this.set_system_info() || null;
+                } else {
+                    info = uni.getStorageSync(this.data.cache_system_info_key) || null;
+                }
+                if(info == null || (key|| null) == null) {
+                    return info;
+                }
+                return (info[key] == undefined) ? (dv == undefined ? null : dv) : info[key];
+            },
 
-			/**
-			 * 当前是否单页模式
-			 */
-			is_current_single_page() {
-				var scene = this.get_scene_data();
-				// #ifdef MP-WEIXIN
-				return (scene == 1154) ? 1 : 0;
-				// #endif
-				return 0;
-			},
+            /**
+             * 设置设备信息
+             */
+            set_system_info() {
+                var system_info = uni.getSystemInfoSync();
+                uni.setStorageSync(this.data.cache_system_info_key, system_info);
+                return system_info;
+            },
 
-			/**
-			 * 场景值获取
-			 */
-			get_scene_data() {
-				return uni.getStorageSync(this.data.cache_scene_key) || 0;
-			},
+            /**
+             * 请求地址生成
+             * a              方法
+             * c              控制器
+             * plugins        插件标记（传参则表示为插件请求）
+             * params         url请求参数
+             * group          组名称（默认 api）
+             */
+            get_request_url(a, c, plugins, params, group) {
+                a = a || "index";
+                c = c || "index";
+                
+                // 是否插件请求、走api统一插件调用控制器
+                var plugins_params = "";
+                if ((plugins || null) != null) {
+                    plugins_params = "&pluginsname=" + plugins + "&pluginscontrol=" + c + "&pluginsaction=" + a;
+                    c = "plugins";
+                    a = "index";
+                }
 
-			/**
-			 * 场景值设置
-			 */
-			set_scene_data(params) {
-				var scene = ((params.scene || null) == null) ? 0 : parseInt(params.scene);
-				uni.setStorageSync(this.data.cache_scene_key, scene);
-				return scene;
-			},
+                // 参数处理
+                params = params || "";
+                if (params != "" && params.substr(0, 1) != "&") {
+                    params = "&" + params;
+                }
 
-			/**
-			 * 获取设备信息
-			 * key      指定key
-			 * dv       默认数据（不存在则读取、默认null）
-			 * is_real  是否实时读取
-			 */
-			get_system_info(key, dv, is_real) {
-				var info = null;
-				if ((is_real || false) == true) {
-					info = this.set_system_info() || null;
-				} else {
-					info = uni.getStorageSync(this.data.cache_system_info_key) || null;
-				}
-				if (info == null || (key || null) == null) {
-					return info;
-				}
-				return (info[key] == undefined) ? (dv == undefined ? null : dv) : info[key];
-			},
+                // 参数处理
+                var url = this.data.request_url + (group || "api")+".php?s=" + c + "/" + a + plugins_params;
+                return this.request_params_handle(url) + "&ajax=ajax" + params;
+            },
 
-			/**
-			 * 设置设备信息
-			 */
-			set_system_info() {
-				var system_info = uni.getSystemInfoSync();
-				uni.setStorageSync(this.data.cache_system_info_key, system_info);
-				return system_info;
-			},
-
-			/**
-			 * 请求地址生成
-			 * a              方法
-			 * c              控制器
-			 * plugins        插件标记（传参则表示为插件请求）
-			 * params         url请求参数
-			 * group          组名称（默认 api）
-			 */
-			get_request_url(a, c, plugins, params, group) {
-				a = a || "index";
-				c = c || "index";
-
-				// 是否插件请求、走api统一插件调用控制器
-				var plugins_params = "";
-				if ((plugins || null) != null) {
-					plugins_params = "&pluginsname=" + plugins + "&pluginscontrol=" + c + "&pluginsaction=" + a;
-					c = "plugins";
-					a = "index";
-				}
-
-				// 参数处理
-				params = params || "";
-				if (params != "" && params.substr(0, 1) != "&") {
-					params = "&" + params;
-				}
-
-				// 参数处理
-				var url = this.data.request_url + (group || "api") + ".php?s=" + c + "/" + a + plugins_params;
-				return this.request_params_handle(url) + "&ajax=ajax" + params;
-			},
-
-			/**
-			 * 请求参数处理
-			 * url     url地址
-			 */
-			request_params_handle(url) {
-				// 用户信息
-				var user = this.get_user_cache_info();
-				var token = user == null ? '' : (user.token || '');
-				var uuid = this.request_uuid();
-				var client_value = this.application_client_type();
-				// 启动参数
-				var params = this.get_launch_cache_info();
-				var referrer = params == null ? null : (params.referrer || null);
-				var referrer_params = (referrer == null) ? '' : '&referrer=' + referrer;
-				// 拼接标识
-				var join = (url.indexOf('?') == -1) ? '?' : '&';
-				return url + join + 'system_type=' + this.data.system_type + '&application=app&application_client_type=' +
-					client_value + '&token=' + token + '&uuid=' + uuid + referrer_params;
-			},
+            /**
+             * 请求参数处理
+             * url     url地址
+             */
+            request_params_handle(url) {
+                // 用户信息
+                var user = this.get_user_cache_info();
+                var token = user == null ? '' : (user.token || '');
+                var uuid = this.request_uuid();
+                var client_value = this.application_client_type();
+                // 启动参数
+                var params = this.get_launch_cache_info();
+                var referrer = params == null ? null : (params.referrer || null);
+                var referrer_params = (referrer == null) ? '' : '&referrer='+referrer;
+                // 拼接标识
+                var join = (url.indexOf('?') == -1) ? '?' : '&';
+                return url + join + 'system_type='+ this.data.system_type +'&application=app&application_client_type='+ client_value + '&token=' + token + '&uuid=' + uuid + referrer_params;
+            },
 
 			/**
 			 * 获取tab页面切换参数
@@ -232,1580 +241,1593 @@
 				uni.removeStorageSync(this.data.cache_page_tabbar_switch_params);
 			},
 
-			/**
-			 * 获取用户信息,信息不存在则唤醒授权
-			 * object     回调操作对象
-			 * method     回调操作对象的函数
-			 * params     回调操请求参数
-			 * return     有用户数据直接返回, 则回调调用者
-			 */
-			get_user_info(object, method, params) {
-				var user = this.get_user_cache_info();
-				if (user == null) {
-					// #ifdef MP
-					// 小程序唤醒用户授权
-					this.user_login(object, method, params);
-					// #endif
+            /**
+             * 获取用户信息,信息不存在则唤醒授权
+             * object     回调操作对象
+             * method     回调操作对象的函数
+             * params     回调操请求参数
+             * return     有用户数据直接返回, 则回调调用者
+             */
+            get_user_info(object, method, params) {
+                var user = this.get_user_cache_info();
+                if (user == null) {
+                    // #ifdef MP
+                    // 小程序唤醒用户授权
+                    this.user_login(object, method, params);
+                    // #endif
 
-					// #ifdef H5 || APP
-					// h5、app登录注册
-					uni.showModal({
-						title: '温馨提示',
-						content: '请先登录或注册',
-						confirmText: '确认',
-						cancelText: '暂不',
-						success: result => {
-							if (result.confirm) {
-								uni.navigateTo({
-									url: "/pages/login/login"
-								});
-							}
-						}
-					});
-					// #endif
+                    // #ifdef H5 || APP
+                    // h5、app登录注册
+                    uni.showModal({
+                        title: '温馨提示',
+                        content: '请先登录或注册',
+                        confirmText: '确认',
+                        cancelText: '暂不',
+                        success: result => {
+                            if (result.confirm) {
+                                uni.navigateTo({
+                                    url: "/pages/login/login"
+                                });
+                            }
+                        }
+                    });
+                    // #endif
 
-					return false;
-				}
-				return user;
-			},
+                    return false;
+                }
+                return user;
+            },
 
-			/**
-			 * 从缓存获取用户信息、可指定key和默认值
-			 * key              数据key
-			 * default_value    默认值
-			 */
-			get_user_cache_info(key, default_value) {
-				var user = uni.getStorageSync(this.data.cache_user_info_key) || null;
-				if (user == null) {
-					// 是否存在默认值
-					return default_value == undefined ? null : default_value;
-				}
+            /**
+             * 从缓存获取用户信息、可指定key和默认值
+             * key              数据key
+             * default_value    默认值
+             */
+            get_user_cache_info(key, default_value) {
+                var user = uni.getStorageSync(this.data.cache_user_info_key) || null;
+                if (user == null) {
+                    // 是否存在默认值
+                    return default_value == undefined ? null : default_value;
+                }
 
-				// 是否读取key
-				if ((key || null) != null) {
-					return user[key] == undefined ? default_value == undefined ? null : default_value : user[key];
-				}
+                // 是否读取key
+                if ((key || null) != null) {
+                    return user[key] == undefined ? default_value == undefined ? null : default_value : user[key];
+                }
 
-				return user;
-			},
+                return user;
+            },
 
-			/**
-			 * 系统参数获取
-			 */
-			get_launch_cache_info() {
-				return uni.getStorageSync(this.data.cache_launch_info_key) || null;
-			},
+            /**
+             * 系统参数获取
+             */
+            get_launch_cache_info() {
+                return uni.getStorageSync(this.data.cache_launch_info_key) || null;
+            },
 
-			/**
-			 * 系统参数设置
-			 */
-			set_launch_cache_info(params) {
-				params = this.launch_params_handle(params);
-				uni.setStorageSync(this.data.cache_launch_info_key, params);
-				return params;
-			},
+            /**
+             * 系统参数设置
+             */
+            set_launch_cache_info(params) {
+                params = this.launch_params_handle(params);
+                uni.setStorageSync(this.data.cache_launch_info_key, params);
+                return params;
+            },
 
-			/**
-			 * 获取登录授权数据
-			 */
-			get_login_cache_info() {
-				return uni.getStorageSync(this.data.cache_user_login_key) || null;
-			},
+            /**
+             * 获取登录授权数据
+             */
+            get_login_cache_info() {
+                return uni.getStorageSync(this.data.cache_user_login_key) || null;
+            },
 
-			/**
-			 * 用户登录
-			 * object     回调操作对象
-			 * method     回调操作对象的函数
-			 * params     回调请求参数
-			 * auth_data  授权数据
-			 */
-			user_auth_login(object, method, params, auth_data) {
-				var self = this;
-				// #ifdef MP-WEIXIN || MP-QQ || MP-BAIDU || MP-TOUTIAO || MP-KUAISHOU
-				uni.checkSession({
-					success: function() {
-						var login_data = self.get_login_cache_info();
-						if (login_data == null) {
-							self.user_login(object, method, params);
-						} else {
-							self.get_user_login_info(object, method, params, login_data, auth_data);
-						}
-					},
-					fail: function() {
-						uni.removeStorageSync(self.data.cache_user_login_key);
-						self.user_login(object, method, params);
-					}
-				});
-				// #endif
-				// #ifdef MP-ALIPAY
-				var login_data = self.get_login_cache_info();
-				if (login_data == null) {
-					self.user_login(object, method, params);
-				} else {
-					self.get_user_login_info(object, method, params, login_data, auth_data);
-				}
-				// #endif
-			},
+            /**
+             * 用户登录
+             * object     回调操作对象
+             * method     回调操作对象的函数
+             * params     回调请求参数
+             * auth_data  授权数据
+             */
+            user_auth_login(object, method, params, auth_data) {
+                var self = this;
+                // #ifdef MP-WEIXIN || MP-QQ || MP-BAIDU || MP-TOUTIAO || MP-KUAISHOU
+                uni.checkSession({
+                    success: function() {
+                        var login_data = self.get_login_cache_info();
+                        if (login_data == null) {
+                            self.user_login(object, method, params);
+                        } else {
+                            self.get_user_login_info(object, method, params, login_data, auth_data);
+                        }
+                    },
+                    fail: function() {
+                        uni.removeStorageSync(self.data.cache_user_login_key);
+                        self.user_login(object, method, params);
+                    }
+                });
+                // #endif
+                // #ifdef MP-ALIPAY
+                var login_data = self.get_login_cache_info();
+                if (login_data == null) {
+                    self.user_login(object, method, params);
+                } else {
+                    self.get_user_login_info(object, method, params, login_data, auth_data);
+                }
+                // #endif
+            },
 
-			/**
-			 * 用户登录
-			 * object     回调操作对象
-			 * method     回调操作对象的函数
-			 * params     回调操请求参数
-			 */
-			user_login(object, method, params) {
-				var login_data = uni.getStorageSync(this.data.cache_user_login_key) || null;
-				if (login_data == null) {
-					this.user_login_handle(object, method, params, true);
-				} else {
-					this.login_to_auth();
-				}
-			},
+            /**
+             * 用户登录
+             * object     回调操作对象
+             * method     回调操作对象的函数
+             * params     回调操请求参数
+             */
+            user_login(object, method, params) {
+                var login_data = uni.getStorageSync(this.data.cache_user_login_key) || null;
+                if (login_data == null) {
+                    this.user_login_handle(object, method, params, true);
+                } else {
+                    this.login_to_auth();
+                }
+            },
 
-			/**
-			 * 用户登录处理
-			 * object     回调操作对象
-			 * method     回调操作对象的函数
-			 * params     回调操请求参数
-			 * is_to_auth 是否进入授权
-			 */
-			user_login_handle(object, method, params, is_to_auth = true) {
-				var self = this;
-				uni.showLoading({
-					title: "授权中..."
-				});
-				var action = 'login';
-				// #ifdef MP-BAIDU
-				action = 'getLoginCode';
-				// #endif
-				uni[action]({
-					success: res => {
-						if (res.code) {
-							uni.request({
-								url: self.get_request_url('appminiuserauth', 'user'),
-								method: 'POST',
-								data: {
-									authcode: res.code
-								},
-								dataType: 'json',
-								success: res => {
-									uni.hideLoading();
-									if (res.data.code == 0) {
-										var data = res.data.data;
-										var client_type = this.application_client_type();
-										if ((data.is_user_exist || 0) == 1 || client_type ==
-											'weixin') {
-											uni.setStorageSync(self.data.cache_user_info_key,
-												data);
-											if (typeof object === 'object' && (method || null) !=
-												null) {
-												object[method](params);
-											}
-										} else {
-											uni.setStorageSync(self.data.cache_user_login_key,
-												data);
-											if (is_to_auth) {
+            /**
+             * 用户登录处理
+             * object     回调操作对象
+             * method     回调操作对象的函数
+             * params     回调操请求参数
+             * is_to_auth 是否进入授权
+             */
+            user_login_handle(object, method, params, is_to_auth = true) {
+                var self = this;
+                uni.showLoading({
+                    title: "授权中..."
+                });
+                var action = 'login';
+                // #ifdef MP-BAIDU
+                action = 'getLoginCode';
+                // #endif
+                uni[action]({
+                    success: res => {
+                        if (res.code) {
+                            uni.request({
+                                url: self.get_request_url('appminiuserauth', 'user'),
+                                method: 'POST',
+                                data: {
+                                    authcode: res.code
+                                },
+                                dataType: 'json',
+                                success: res => {
+                                    uni.hideLoading();
+                                    if (res.data.code == 0) {
+                                        var data = res.data.data;
+                                        var client_type = this.application_client_type();
+                                        if ((data.is_user_exist || 0) == 1 || client_type == 'weixin') {
+											uni.setStorageSync(self.data.cache_user_info_key, data);
+                                            if (typeof object === 'object' && (method || null) != null) {
+                                                object[method](params);
+                                            }
+                                        } else {
+                                            uni.setStorageSync(self.data.cache_user_login_key, data);
+                                            if(is_to_auth) {
 												var pages = getCurrentPages();
-												if (pages[pages.length - 1]['route'] ==
-													'pages/login/login') {
-													if (typeof object === 'object' && (method ||
-															null) != null) {
-														object[method](params);
+												if(pages[pages.length-1]['route'] == 'pages/login/login') {
+													if (typeof object === 'object' && (method || null) != null) {
+													    object[method](params);
 													}
 												} else {
 													self.login_to_auth();
 												}
-											}
-										}
-									} else {
-										uni.hideLoading();
-										self.showToast(res.data.msg);
-									}
-								},
-								fail: () => {
-									uni.hideLoading();
-									self.showToast('服务器请求出错');
-								}
-							});
-						}
-					},
-					fail: e => {
-						uni.hideLoading();
-						self.showToast('授权失败');
-					}
-				});
-			},
+                                            }
+                                        }
+                                    } else {
+                                        uni.hideLoading();
+                                        self.showToast(res.data.msg);
+                                    }
+                                },
+                                fail: () => {
+                                    uni.hideLoading();
+                                    self.showToast('服务器请求出错');
+                                }
+                            });
+                        }
+                    },
+                    fail: e => {
+                        uni.hideLoading();
+                        self.showToast('授权失败');
+                    }
+                });
+            },
 
-			/**
-			 * 跳转到登录页面授权
-			 */
-			login_to_auth() {
-				uni.showModal({
-					title: '温馨提示',
-					content: '授权用户信息',
-					confirmText: '确认',
-					cancelText: '暂不',
-					success: result => {
-						if (result.confirm) {
-							uni.navigateTo({
-								url: "/pages/login/login"
-							});
-						}
-					}
-				});
-			},
+            /**
+             * 跳转到登录页面授权
+             */
+            login_to_auth() {
+                uni.showModal({
+                    title: '温馨提示',
+                    content: '授权用户信息',
+                    confirmText: '确认',
+                    cancelText: '暂不',
+                    success: result => {
+                        if (result.confirm) {
+                            uni.navigateTo({
+                                url: "/pages/login/login"
+                            });
+                        }
+                    }
+                });
+            },
 
-			/**
-			 * 获取用户授权信息
-			 * object     回调操作对象
-			 * method     回调操作对象的函数
-			 * params     回调请求参数
-			 * login_data 登录信息
-			 * auth_data  授权数据
-			 */
-			get_user_login_info(object, method, params, login_data, auth_data) {
-				// 请求数据
-				var data = {
-					auth_data: JSON.stringify(auth_data),
-					openid: login_data.openid,
-					unionid: login_data.unionid
-				};
-
-				// 用户信息处理
-				uni.showLoading({
-					title: "授权中..."
-				});
-				var self = this;
-				uni.request({
-					url: self.get_request_url('appminiuserinfo', 'user'),
-					method: 'POST',
-					data: data,
-					dataType: 'json',
-					success: res => {
-						uni.hideLoading();
-						if (res.data.code == 0) {
+            /**
+             * 获取用户授权信息
+             * object     回调操作对象
+             * method     回调操作对象的函数
+             * params     回调请求参数
+             * login_data 登录信息
+             * auth_data  授权数据
+             */
+            get_user_login_info(object, method, params, login_data, auth_data) {
+                // 请求数据
+                var data = {
+                    auth_data: JSON.stringify(auth_data),
+                    openid: login_data.openid,
+                    unionid: login_data.unionid
+                };
+                
+                // 用户信息处理
+                uni.showLoading({
+                    title: "授权中..."
+                });
+                var self = this;
+                uni.request({
+                    url: self.get_request_url('appminiuserinfo', 'user'),
+                    method: 'POST',
+                    data: data,
+                    dataType: 'json',
+                    success: res => {
+                        uni.hideLoading();
+                        if (res.data.code == 0) {
 							uni.setStorageSync(self.data.cache_user_info_key, res.data.data);
-							if (typeof object === 'object' && (method || null) != null) {
-								object[method](params);
-							}
-						} else {
-							self.showToast(res.data.msg);
-						}
-					},
-					fail: () => {
-						uni.hideLoading();
-						self.showToast('服务器请求出错');
-					}
-				});
-			},
+                            if (typeof object === 'object' && (method || null) != null) {
+                                object[method](params);
+                            }
+                        } else {
+                            self.showToast(res.data.msg);
+                        }
+                    },
+                    fail: () => {
+                        uni.hideLoading();
+                        self.showToast('服务器请求出错');
+                    }
+                });
+            },
 
-			/**
-			 * 字段数据校验
-			 * data           待校验的数据, 一维json对象
-			 * validation     待校验的字段, 格式 [{fields: 'mobile', msg: '请填写手机号码', is_can_zero: 1(是否可以为0)}, ...]
-			 */
-			fields_check(data, validation) {
-				for (var i in validation) {
-					var temp_value = data[validation[i]["fields"]];
-					var temp_is_can_zero = validation[i]["is_can_zero"] || null;
-					if (temp_value == undefined || temp_value.length == 0 || temp_value == -1 || temp_is_can_zero ==
-						null && temp_value == 0) {
-						this.showToast(validation[i]['msg']);
-						return false;
-					}
-				}
-				return true;
-			},
+            /**
+             * 字段数据校验
+             * data           待校验的数据, 一维json对象
+             * validation     待校验的字段, 格式 [{fields: 'mobile', msg: '请填写手机号码', is_can_zero: 1(是否可以为0)}, ...]
+             */
+            fields_check(data, validation) {
+                for (var i in validation) {
+                    var temp_value = data[validation[i]["fields"]];
+                    var temp_is_can_zero = validation[i]["is_can_zero"] || null;
+                    if (temp_value == undefined || temp_value.length == 0 || temp_value == -1 || temp_is_can_zero ==
+                        null && temp_value == 0) {
+                        this.showToast(validation[i]['msg']);
+                        return false;
+                    }
+                }
+                return true;
+            },
 
-			/**
-			 * 获取当前时间戳
-			 */
-			get_timestamp() {
-				return parseInt(new Date().getTime() / 1000);
-			},
+            /**
+             * 获取当前时间戳
+             */
+            get_timestamp() {
+                return parseInt(new Date().getTime() / 1000);
+            },
 
-			/**
-			 * 获取日期
-			 * format       日期格式（默认 yyyy-MM-dd h:m:s）
-			 * timestamp    时间戳（默认当前时间戳）
-			 */
-			get_date(format, timestamp) {
-				var d = new Date((timestamp || this.get_timestamp()) * 1000);
-				var date = {
-					"M+": d.getMonth() + 1,
-					"d+": d.getDate(),
-					"h+": d.getHours(),
-					"m+": d.getMinutes(),
-					"s+": d.getSeconds(),
-					"q+": Math.floor((d.getMonth() + 3) / 3),
-					"S+": d.getMilliseconds()
-				};
-				if (/(y+)/i.test(format)) {
-					format = format.replace(RegExp.$1, (d.getFullYear() + '').substr(4 - RegExp.$1.length));
-				}
-				for (var k in date) {
-					if (new RegExp("(" + k + ")").test(format)) {
-						format = format.replace(RegExp.$1, RegExp.$1.length == 1 ? date[k] : ("00" + date[k]).substr(("" +
-							date[k]).length));
-					}
-				}
+            /**
+             * 获取日期
+             * format       日期格式（默认 yyyy-MM-dd h:m:s）
+             * timestamp    时间戳（默认当前时间戳）
+             */
+            get_date(format, timestamp) {
+                var d = new Date((timestamp || this.get_timestamp()) * 1000);
+                var date = {
+                    "M+": d.getMonth() + 1,
+                    "d+": d.getDate(),
+                    "h+": d.getHours(),
+                    "m+": d.getMinutes(),
+                    "s+": d.getSeconds(),
+                    "q+": Math.floor((d.getMonth() + 3) / 3),
+                    "S+": d.getMilliseconds()
+                };
+                if (/(y+)/i.test(format)) {
+                    format = format.replace(RegExp.$1, (d.getFullYear() + '').substr(4 - RegExp.$1.length));
+                }
+                for (var k in date) {
+                    if (new RegExp("(" + k + ")").test(format)) {
+                        format = format.replace(RegExp.$1, RegExp.$1.length == 1 ? date[k] : ("00" + date[k]).substr(("" + date[k]).length));
+                    }
+                }
 
-				return format;
-			},
+                return format;
+            },
 
-			/**
-			 * 获取对象、数组的长度、元素个数
-			 * obj      要计算长度的元素（object、array、string）
-			 */
-			get_length(obj) {
-				var obj_type = typeof obj;
-				if (obj_type == "string") {
-					return obj.length;
-				} else if (obj_type == "object") {
-					var obj_len = 0;
-					for (var i in obj) {
-						obj_len++;
-					}
-					return obj_len;
-				}
-				return false;
-			},
+            /**
+             * 获取对象、数组的长度、元素个数
+             * obj      要计算长度的元素（object、array、string）
+             */
+            get_length(obj) {
+                var obj_type = typeof obj;
+                if (obj_type == "string") {
+                    return obj.length;
+                } else if (obj_type == "object") {
+                    var obj_len = 0;
+                    for (var i in obj) {
+                        obj_len++;
+                    }
+                    return obj_len;
+                }
+                return false;
+            },
 
-			/**
-			 * 价格保留两位小数
-			 * price      价格保留两位小数
-			 */
-			price_two_decimal(x) {
-				var f_x = parseFloat(x);
-				if (isNaN(f_x)) {
-					return 0;
-				}
-				var f_x = Math.round(x * 100) / 100;
-				var s_x = f_x.toString();
-				var pos_decimal = s_x.indexOf('.');
-				if (pos_decimal < 0) {
-					pos_decimal = s_x.length;
-					s_x += '.';
-				}
-				while (s_x.length <= pos_decimal + 2) {
-					s_x += '0';
-				}
-				return s_x;
-			},
+            /**
+             * 价格保留两位小数
+             * price      价格保留两位小数
+             */
+            price_two_decimal(x) {
+                var f_x = parseFloat(x);
+                if (isNaN(f_x)) {
+                    return 0;
+                }
+                var f_x = Math.round(x * 100) / 100;
+                var s_x = f_x.toString();
+                var pos_decimal = s_x.indexOf('.');
+                if (pos_decimal < 0) {
+                    pos_decimal = s_x.length;
+                    s_x += '.';
+                }
+                while (s_x.length <= pos_decimal + 2) {
+                    s_x += '0';
+                }
+                return s_x;
+            },
 
-			// url主要部分
-			get_url_main_part(url) {
-				if (url.indexOf("?") == -1) {
-					var value = url;
-				} else {
-					var temp_str = url.split("?");
-					var value = temp_str[0];
-				}
-				return value;
-			},
+            // url主要部分
+            get_url_main_part(url) {
+                if (url.indexOf("?") == -1) {
+                    var value = url;
+                } else {
+                    var temp_str = url.split("?");
+                    var value = temp_str[0];
+                }
+                return value;
+            },
 
-			/**
-			 * 当前地址是否存在tabbar中
-			 */
-			is_tabbar_pages(url) {
-				var value = this.get_url_main_part(url);
-				if ((value || null) == null) {
-					return false;
-				}
-				var temp_tabbar_pages = this.data.tabbar_pages;
-				for (var i in temp_tabbar_pages) {
-					if (temp_tabbar_pages[i] == value) {
-						return true;
-					}
-				}
-				return false;
-			},
+            /**
+             * 当前地址是否存在tabbar中
+             */
+            is_tabbar_pages(url) {
+                var value = this.get_url_main_part(url);
+                if ((value || null) == null) {
+                    return false;
+                }
+                var temp_tabbar_pages = this.data.tabbar_pages;
+                for (var i in temp_tabbar_pages) {
+                    if (temp_tabbar_pages[i] == value) {
+                        return true;
+                    }
+                }
+                return false;
+            },
 
-			/**
-			 * 事件操作
-			 */
-			operation_event(e) {
-				var value = e.currentTarget.dataset.value || null;
-				var type = parseInt(e.currentTarget.dataset.type);
-				if (value != null) {
-					switch (type) {
-						// web
-						case 0:
-							this.open_web_view(value);
-							break;
-							// 内部页面
-						case 1:
-							if (this.is_tabbar_pages(value)) {
+            /**
+             * 事件操作
+             */
+            operation_event(e) {
+                var value = e.currentTarget.dataset.value || null;
+                var type = parseInt(e.currentTarget.dataset.type);
+                if (value != null) {
+                    switch (type) {
+                        // web
+                        case 0:
+                            this.open_web_view(value);
+                            break;
+                        // 内部页面
+                        case 1:
+                            if (this.is_tabbar_pages(value)) {
 								var temp = value.split('?');
-								if (temp.length > 1 && (temp[1] || null) != null) {
+								if(temp.length > 1 && (temp[1] || null) != null)
+								{
 									value = temp[0];
 									var query = this.url_params_to_json(temp[1]);
 									uni.setStorageSync(this.data.cache_page_tabbar_switch_params, query);
 								}
-								uni.switchTab({
-									url: value
-								});
-							} else {
-								uni.navigateTo({
-									url: value
-								});
-							}
-							break;
-							// 跳转到外部小程序
-						case 2:
-							uni.navigateToMiniProgram({
-								appId: value
-							});
-							break;
-							// 跳转到地图查看位置
-						case 3:
-							var values = value.split('|');
-							if (values.length != 4) {
-								this.showToast('事件值格式有误');
-								return false;
-							}
-							this.open_location(values[2], values[3], values[0], values[1]);
-							break;
-							// 拨打电话
-						case 4:
-							this.call_tel(value);
-							break;
-					}
-				}
-			},
+                                uni.switchTab({
+                                    url: value
+                                });
+                            } else {
+                                uni.navigateTo({
+                                    url: value
+                                });
+                            }
+                            break;
+                        // 跳转到外部小程序
+                        case 2:
+                            uni.navigateToMiniProgram({
+                                appId: value
+                            });
+                            break;
+                        // 跳转到地图查看位置
+                        case 3:
+                            var values = value.split('|');
+                            if (values.length != 4) {
+                                this.showToast('事件值格式有误');
+                                return false;
+                            }
+                            this.open_location(values[2], values[3], values[0], values[1]);
+                            break;
+                        // 拨打电话
+                        case 4:
+                            this.call_tel(value);
+                            break;
+                    }
+                }
+            },
 
-			/**
-			 * 打开 webview页面
-			 * value    [string]  url地址
-			 */
-			open_web_view(value) {
-				uni.navigateTo({
-					url: "/pages/web-view/web-view?url=" + encodeURIComponent(value)
-				});
-			},
+            /**
+             * 打开 webview页面
+             * value    [string]  url地址
+             */
+            open_web_view(value) {
+                uni.navigateTo({
+                    url: "/pages/web-view/web-view?url=" + encodeURIComponent(value)
+                });
+            },
 
-			/**
-			 * 默认弱提示方法
-			 * msg    [string]  提示信息
-			 * status [string]  状态 默认error [正确success, 错误error]
-			 */
-			showToast(msg, status) {
-				if ((status || 'error') == 'success') {
-					uni.showToast({
-						icon: 'success',
-						title: msg,
-						duration: 3000
-					});
-				} else {
-					uni.showToast({
-						icon: 'none',
-						title: msg,
-						duration: 3000
-					});
-				}
-			},
+            /**
+             * 默认弱提示方法
+             * msg    [string]  提示信息
+             * status [string]  状态 默认error [正确success, 错误error]
+             */
+            showToast(msg, status) {
+                if ((status || 'error') == 'success') {
+                    uni.showToast({
+                        icon: 'success',
+                        title: msg,
+                        duration: 3000
+                    });
+                } else {
+                    uni.showToast({
+                        icon: 'none',
+                        title: msg,
+                        duration: 3000
+                    });
+                }
+            },
 
-			/**
-			 * alert确认框
-			 * title              [string]    标题（默认空）
-			 * msg                [string]    提示信息，必传
-			 * is_show_cancel     [int]       是否显示取消按钮（默认显示 0否, 1|undefined是）
-			 * cancel_text        [string]    取消按钮文字（默认 取消）
-			 * cancel_color       [string]    取消按钮的文字颜色，必须是 16 进制格式的颜色字符串（默认 #000000）
-			 * confirm_text       [string]    确认按钮文字（默认 确认）
-			 * confirm_color      [string]    确认按钮的文字颜色，必须是 16 进制格式的颜色字符串（默认 #000000）
-			 * object             [boject]    回调操作对象，点击确认回调参数1，取消回调0
-			 * method             [string]    回调操作对象的函数
-			 */
-			alert(e) {
-				var msg = e.msg || null;
-				if (msg != null) {
-					var title = e.title || '';
-					var is_show_cancel = e.is_show_cancel == 0 ? false : true;
-					var cancel_text = e.cancel_text || '取消';
-					var confirm_text = e.confirm_text || '确认';
-					var cancel_color = e.cancel_color || '#000000';
-					var confirm_color = e.confirm_color || '#576B95';
-					uni.showModal({
-						title: title,
-						content: msg,
-						showCancel: is_show_cancel,
-						cancelText: cancel_text,
-						cancelColor: cancel_color,
-						confirmText: confirm_text,
-						confirmColor: confirm_color,
-						success(res) {
-							if ((e.object || null) != null && typeof e.object === 'object' && (e.method || null) !=
-								null) {
-								e.object[e.method](res.confirm ? 1 : 0);
-							}
-						}
-					});
-				} else {
-					self.showToast('提示信息为空 alert');
-				}
-			},
+            /**
+             * alert确认框
+             * title              [string]    标题（默认空）
+             * msg                [string]    提示信息，必传
+             * is_show_cancel     [int]       是否显示取消按钮（默认显示 0否, 1|undefined是）
+             * cancel_text        [string]    取消按钮文字（默认 取消）
+             * cancel_color       [string]    取消按钮的文字颜色，必须是 16 进制格式的颜色字符串（默认 #000000）
+             * confirm_text       [string]    确认按钮文字（默认 确认）
+             * confirm_color      [string]    确认按钮的文字颜色，必须是 16 进制格式的颜色字符串（默认 #000000）
+             * object             [boject]    回调操作对象，点击确认回调参数1，取消回调0
+             * method             [string]    回调操作对象的函数
+             */
+            alert(e) {
+                var msg = e.msg || null;
+                if (msg != null) {
+                    var title = e.title || '';
+                    var is_show_cancel = e.is_show_cancel == 0 ? false : true;
+                    var cancel_text = e.cancel_text || '取消';
+                    var confirm_text = e.confirm_text || '确认';
+                    var cancel_color = e.cancel_color || '#000000';
+                    var confirm_color = e.confirm_color || '#576B95';
+                    uni.showModal({
+                        title: title,
+                        content: msg,
+                        showCancel: is_show_cancel,
+                        cancelText: cancel_text,
+                        cancelColor: cancel_color,
+                        confirmText: confirm_text,
+                        confirmColor: confirm_color,
+                        success(res) {
+                            if ((e.object || null) != null && typeof e.object === 'object' && (e.method || null) != null) {
+                                e.object[e.method](res.confirm ? 1 : 0);
+                            }
+                        }
+                    });
+                } else {
+                    self.showToast('提示信息为空 alert');
+                }
+            },
 
-			/**
-			 * 是否需要登录
-			 * 是否需要绑定手机号码
-			 */
-			user_is_need_login(user) {
-				// 用户信息是否正确
-				if ((user || null) == null) {
-					return true;
-				}
-				// 是否需要绑定手机号码
-				if ((user.is_mandatory_bind_mobile || 0) == 1) {
-					if ((user.mobile || null) == null) {
-						return true;
-					}
-				}
-				return false;
-			},
+            /**
+             * 是否需要登录
+             * 是否需要绑定手机号码
+             */
+            user_is_need_login(user) {
+                // 用户信息是否正确
+                if ((user || null) == null) {
+                    return true;
+                }
+                // 是否需要绑定手机号码
+                if ((user.is_mandatory_bind_mobile || 0) == 1) {
+                    if ((user.mobile || null) == null) {
+                        return true;
+                    }
+                }
+                return false;
+            },
 
-			// url参数转json对象
-			url_params_to_json(url_params) {
-				var json = new Object();
-				if ((url_params || null) != null) {
-					var arr = url_params.split('&');
-					for (var i = 0; i < arr.length; i++) {
-						var temp = arr[i].split('=');
-						json[temp[0]] = temp[1];
-					}
-				}
-				return json;
-			},
+            // url参数转json对象
+            url_params_to_json(url_params) {
+                var json = new Object();
+                if ((url_params || null) != null) {
+                    var arr = url_params.split('&');
+                    for (var i = 0; i < arr.length; i++) {
+                        var temp = arr[i].split('=');
+                        json[temp[0]] = temp[1];
+                    }
+                }
+                return json;
+            },
 
-			// json对象转url请求参数
-			json_to_url_params(data) {
-				var str = '';
-				for (var i in data) {
-					if (str != '') {
-						str += '&';
-					}
-					str += i + '=' + data[i];
-				}
-				return str;
-			},
+            // json对象转url请求参数
+            json_to_url_params(data) {
+                var str = '';
+                for(var i in data) {
+                    if(str != '') {
+                        str += '&';
+                    }
+                    str += i+'='+data[i];
+                }
+                return str;
+            },
 
-			// 拨打电话
-			call_tel(data) {
-				var value = (typeof(data) == 'object') ? (data.currentTarget.dataset.value || null) : (data || null);
-				if (value != null) {
-					uni.makePhoneCall({
-						phoneNumber: value.toString()
-					});
-				}
-			},
+            // 拨打电话
+            call_tel(data) {
+                var value = (typeof(data) == 'object') ? (data.currentTarget.dataset.value || null) : (data || null);
+                if (value != null) {
+                    uni.makePhoneCall({
+                        phoneNumber: value.toString()
+                    });
+                }
+            },
 
-			/**
-			 * 登录校验
-			 * object     回调操作对象
-			 * method     回调操作对象的函数
-			 * params     回调请求参数
-			 */
-			is_login_check(res, object, method, params) {
-				if (res.code == -400) {
-					uni.clearStorage();
-					this.get_user_info(object, method, params);
-					return false;
-				}
-				return true;
-			},
+            /**
+             * 登录校验
+             * object     回调操作对象
+             * method     回调操作对象的函数
+             * params     回调请求参数
+             */
+            is_login_check(res, object, method, params) {
+                if (res.code == -400) {
+                    uni.clearStorage();
+                    this.get_user_info(object, method, params);
+                    return false;
+                }
+                return true;
+            },
 
-			/**
-			 * 设置导航reddot
-			 * index     tabBar 的哪一项，从左边算起（0开始）
-			 * type      0 移出, 1 添加 （默认 0 移出）
-			 */
-			set_tab_bar_reddot(index, type) {
-				if (index !== undefined && index !== null) {
-					if ((type || 0) == 0) {
-						uni.hideTabBarRedDot({
-							index: Number(index)
-						});
-					} else {
-						uni.showTabBarRedDot({
-							index: Number(index)
-						});
-					}
-				}
-			},
+            /**
+             * 设置导航reddot
+             * index     tabBar 的哪一项，从左边算起（0开始）
+             * type      0 移出, 1 添加 （默认 0 移出）
+             */
+            set_tab_bar_reddot(index, type) {
+                if (index !== undefined && index !== null) {
+                    if ((type || 0) == 0) {
+                        uni.hideTabBarRedDot({
+                            index: Number(index)
+                        });
+                    } else {
+                        uni.showTabBarRedDot({
+                            index: Number(index)
+                        });
+                    }
+                }
+            },
 
-			/**
-			 * 设置导航车badge
-			 * index     tabBar 的哪一项，从左边算起（0开始）
-			 * type      0 移出, 1 添加 （默认 0 移出）
-			 * value     显示的文本，超过 4 个字符则显示成 ...（type参数为1的情况下有效）
-			 */
-			set_tab_bar_badge(index, type, value) {
-				if (index !== undefined && index !== null) {
-					if ((type || 0) == 0) {
-						uni.removeTabBarBadge({
-							index: Number(index)
-						});
-					} else {
-						uni.setTabBarBadge({
-							index: Number(index),
-							"text": value.toString()
-						});
-					}
-				}
-			},
+            /**
+             * 设置导航车badge
+             * index     tabBar 的哪一项，从左边算起（0开始）
+             * type      0 移出, 1 添加 （默认 0 移出）
+             * value     显示的文本，超过 4 个字符则显示成 ...（type参数为1的情况下有效）
+             */
+            set_tab_bar_badge(index, type, value) {
+                if (index !== undefined && index !== null) {
+                    if ((type || 0) == 0) {
+                        uni.removeTabBarBadge({
+                            index: Number(index)
+                        });
+                    } else {
+                        uni.setTabBarBadge({
+                            index: Number(index),
+                            "text": value.toString()
+                        });
+                    }
+                }
+            },
 
-			// 页面分享处理
-			page_share_handle(share = null) {
-				// 当前页面
-				var pages = getCurrentPages();
-				var obj = pages[pages.length - 1];
+            // 页面分享处理
+            page_share_handle(share = null) {
+                // 当前页面
+                var pages = getCurrentPages();
+                var obj = pages[pages.length-1];
 
-				// 分享信息、是否指定参数
-				if ((share || null) == null) {
-					share = {}
-				}
-				// 从页面对象获取参数
-				if (Object.keys(share).length <= 0) {
-					share = obj.share_info || {};
-				}
-				// 参数处理
-				share = this.share_content_handle(share);
+                // 分享信息、是否指定参数
+                if((share || null) == null) {
+                    share = {}
+                }
+                // 从页面对象获取参数
+                if(Object.keys(share).length <= 0) {
+                    share = obj.share_info || {};
+                }
+                // 参数处理
+                share = this.share_content_handle(share);
 
-				// #ifdef MP-WEIXIN
-				// 微信小程序展示系统分享好友和朋友圈按钮
-				// 其他端小程序不用展示会调起分享窗口
-				var not_pages = ['/pages/user/user', '/pages/cart/cart'];
-				if (not_pages.indexOf(share.url) == -1) {
-					uni.showShareMenu({
-						withShareTicket: true,
-						title: share.title,
-						desc: share.desc,
-						path: share.path + share.query,
-						imageUrl: share.img,
-						menus: ['shareAppMessage', 'shareTimeline']
-					});
-				} else {
-					wx.hideShareMenu({
-						menus: ['shareTimeline']
-					});
-				}
-				// #endif
-				// #ifdef H5
-				// H5处理微信环境分享自定义信息
-				if (this.is_weixin_env()) {
-					var page_url = this.get_page_url();
-					uni.request({
-						url: this.get_request_url("signpackage", "index", "share"),
-						method: "POST",
-						data: {
-							url: encodeURIComponent(page_url)
-						},
-						dataType: "json",
-						success: res => {
-							if (res.data.code == 0 && (res.data.data.package || null) != null) {
-								var data = res.data.data.package;
-								var wx = require('jweixin-module');
-								wx.config({
-									debug: false,
-									appId: data.appId,
-									timestamp: data.timestamp,
-									nonceStr: data.nonceStr,
-									signature: data.signature,
-									jsApiList: [
-										'updateAppMessageShareData',
-										'updateTimelineShareData',
-										'onMenuShareWeibo'
-									]
-								});
-								wx.ready(function() {
-									// 自定义“分享给朋友”及“分享到QQ”按钮的分享内容
-									wx.updateAppMessageShareData({
-										title: share.title,
-										desc: share.desc,
-										link: share.url,
-										imgUrl: share.img
-									});
-									// 自定义“分享到朋友圈”及“分享到QQ空间”按钮的分享内容
-									wx.updateTimelineShareData({
-										title: share.title,
-										link: share.url,
-										imgUrl: share.img
-									});
-									// 获取“分享到腾讯微博”按钮点击状态及自定义分享内容接口
-									wx.onMenuShareWeibo({
-										title: share.title,
-										desc: share.desc,
-										link: share.url,
-										imgUrl: share.img
-									});
-								});
-							}
-						},
-						fail: () => {
-							this.showToast("服务器请求出错");
-						}
-					});
-				}
-				// #endif
+                // #ifdef MP-WEIXIN
+                // 微信小程序展示系统分享好友和朋友圈按钮
+                // 其他端小程序不用展示会调起分享窗口
+                var not_pages = ['/pages/user/user', '/pages/cart/cart'];
+                if(not_pages.indexOf(share.url) == -1) {
+                    uni.showShareMenu({
+                        withShareTicket: true,
+                        title: share.title,
+                        desc: share.desc,
+                        path: share.path + share.query,
+                        imageUrl: share.img,
+                        menus: ['shareAppMessage', 'shareTimeline']
+                    });
+                } else {
+                    wx.hideShareMenu({
+                      menus: ['shareTimeline']
+                    });
+                }
+                // #endif
+                // #ifdef H5
+                // H5处理微信环境分享自定义信息
+                if(this.is_weixin_env()) {
+                    var page_url = this.get_page_url();
+                    uni.request({
+                        url: this.get_request_url("signpackage", "index", "share"),
+                        method: "POST",
+                        data: {
+                            url: encodeURIComponent(page_url)
+                        },
+                        dataType: "json",
+                        success: res => {
+                            if (res.data.code == 0 && (res.data.data.package || null) != null) {
+                                var data = res.data.data.package;
+                                var wx = require('jweixin-module');                                
+                                wx.config({
+                                    debug: false,
+                                    appId: data.appId,
+                                    timestamp: data.timestamp,
+                                    nonceStr: data.nonceStr,
+                                    signature: data.signature,
+                                    jsApiList: [
+                                        'updateAppMessageShareData',
+                                        'updateTimelineShareData',
+                                        'onMenuShareWeibo'
+                                    ]
+                                });
+                                wx.ready(function () {
+                                    // 自定义“分享给朋友”及“分享到QQ”按钮的分享内容
+                                    wx.updateAppMessageShareData({
+                                        title: share.title,
+                                        desc: share.desc,
+                                        link: share.url,
+                                        imgUrl: share.img
+                                    });
+                                    // 自定义“分享到朋友圈”及“分享到QQ空间”按钮的分享内容
+                                    wx.updateTimelineShareData({ 
+                                        title: share.title,
+                                        link: share.url,
+                                        imgUrl: share.img
+                                    });
+                                    // 获取“分享到腾讯微博”按钮点击状态及自定义分享内容接口
+                                    wx.onMenuShareWeibo({
+                                        title: share.title,
+                                        desc: share.desc,
+                                        link: share.url,
+                                        imgUrl: share.img
+                                    });
+                                });
+                            }
+                        },
+                        fail: () => {
+                            this.showToast("服务器请求出错");
+                        }
+                    });
+                }
+                // #endif
+                
+                // #ifdef MP-BAIDU
+                // 百度小程序wab化搜索引擎数据设置
+                uni.setPageInfo({
+                  title: share.title,
+                  keywords: share.kds || share.desc,
+                  articleTitle: share.title,
+                  description: share.desc,
+                  image: share.img,
+                  video: ((share.video || null) == null) ? [] : [{
+                            url: share.video,
+                            duration: '100',
+                            image: share.img
+                        }]
+                });
+                // #endif
+            },
 
-				// #ifdef MP-BAIDU
-				// 百度小程序wab化搜索引擎数据设置
-				uni.setPageInfo({
-					title: share.title,
-					keywords: share.kds || share.desc,
-					articleTitle: share.title,
-					description: share.desc,
-					image: share.img,
-					video: ((share.video || null) == null) ? [] : [{
-						url: share.video,
-						duration: '100',
-						image: share.img
-					}]
-				});
-				// #endif
-			},
+            /**
+             * 获取配置信息、可指定key和默认值
+             * key              数据key（支持多级读取、以 . 分割key名称）
+             * default_value    默认值
+             */
+            get_config(key, default_value) {
+                var value = null;
+                var config = uni.getStorageSync(this.data.cache_config_info_key) || null;
+                if (config != null) {
+                    // 数据读取
+                    var arr = key.split('.');
+                    if (arr.length == 1) {
+                        value = config[key] == undefined ? null : config[key];
+                    } else {
+                        value = config;
+                        for (var i in arr) {
+                            if (value[arr[i]] != undefined) {
+                                value = value[arr[i]];
+                            } else {
+                                value = null;
+                                break;
+                            }
+                        }
+                    }
+                }
+                // 默认值
+                if(value == null && default_value != undefined) {
+                    value = default_value;
+                }
+                // 无数据则处理自定义字段定义的数据
+                if(value == null) {
+                    switch(key) {
+                        // 货币符号
+                        case 'currency_symbol' :
+                            value = this.data.currency_symbol;
+                            break;
+                    }
+                }
+                return value;
+            },
 
-			/**
-			 * 获取配置信息、可指定key和默认值
-			 * key              数据key（支持多级读取、以 . 分割key名称）
-			 * default_value    默认值
-			 */
-			get_config(key, default_value) {
-				var value = null;
-				var config = uni.getStorageSync(this.data.cache_config_info_key) || null;
-				if (config != null) {
-					// 数据读取
-					var arr = key.split('.');
-					if (arr.length == 1) {
-						value = config[key] == undefined ? null : config[key];
-					} else {
-						value = config;
-						for (var i in arr) {
-							if (value[arr[i]] != undefined) {
-								value = value[arr[i]];
-							} else {
-								value = null;
-								break;
-							}
-						}
-					}
-				}
-				// 默认值
-				if (value == null && default_value != undefined) {
-					value = default_value;
-				}
-				// 无数据则处理自定义字段定义的数据
-				if (value == null) {
-					switch (key) {
-						// 货币符号
-						case 'currency_symbol':
-							value = this.data.currency_symbol;
-							break;
-					}
-				}
-				return value;
-			},
+            // 初始化 配置信息
+            init_config() {
+                uni.request({
+                    url: this.get_request_url('common', 'base'),
+                    method: 'POST',
+                    data: {is_key: 1},
+                    dataType: 'json',
+                    success: res => {
+                        if (res.data.code == 0) {
+                            uni.setStorage({
+                                key: this.data.cache_config_info_key,
+                                data: res.data.data,
+                                fail: () => {
+                                    this.showToast('配置信息缓存失败');
+                                }
+                            });
+                            
+                            // 用户自动登录处理
+                            this.user_auto_login_handle();
+                        } else {
+                            this.showToast(res.data.msg);
+                        }
+                    },
+                    fail: () => {
+                        this.showToast('服务器请求出错');
+                    }
+                });
+            },
 
-			// 初始化 配置信息
-			init_config() {
-				uni.request({
-					url: this.get_request_url('common', 'base'),
-					method: 'POST',
-					data: {
-						is_key: 1
-					},
-					dataType: 'json',
-					success: res => {
-						if (res.data.code == 0) {
-							uni.setStorage({
-								key: this.data.cache_config_info_key,
-								data: res.data.data,
-								fail: () => {
-									this.showToast('配置信息缓存失败');
-								}
-							});
+            /**
+             * 配置是否有效(100毫秒检验一次、最多检验100次)
+             * object     回调操作对象
+             * method     回调操作对象的函数
+             */
+            is_config(object, method) {
+                var self = this;
+                var count = 0;
+                var timer = setInterval(function() {
+                    if (self.get_config('status') == 1) {
+                        clearInterval(timer);
 
-							// 用户自动登录处理
-							this.user_auto_login_handle();
-						} else {
-							this.showToast(res.data.msg);
-						}
-					},
-					fail: () => {
-						this.showToast('服务器请求出错');
-					}
-				});
-			},
+                        if (typeof object === 'object' && (method || null) != null) {
+                            object[method](true);
+                        }
+                    }
+                    count++;
 
-			/**
-			 * 配置是否有效(100毫秒检验一次、最多检验100次)
-			 * object     回调操作对象
-			 * method     回调操作对象的函数
-			 */
-			is_config(object, method) {
-				var self = this;
-				var count = 0;
-				var timer = setInterval(function() {
-					if (self.get_config('status') == 1) {
-						clearInterval(timer);
+                    if (count >= 100) {
+                        clearInterval(timer);
+                    }
+                }, 100);
+            },
 
-						if (typeof object === 'object' && (method || null) != null) {
-							object[method](true);
-						}
-					}
-					count++;
+            /**
+             * 火星坐标GCJ02到百度坐标BD-09(高德，谷歌，腾讯坐标 -> 百度)
+             * lng     经度
+             * lat     纬度
+             */
+            map_gcj_to_bd(lng, lat) {
+                lng = parseFloat(lng);
+                lat = parseFloat(lat);
+                let x_pi = 3.14159265358979324 * 3000.0 / 180.0;
+                let x = lng;
+                let y = lat;
+                let z = Math.sqrt(x * x + y * y) + 0.00002 * Math.sin(y * x_pi);
+                let theta = Math.atan2(y, x) + 0.000003 * Math.cos(x * x_pi);
+                let lngs = z * Math.cos(theta) + 0.0065;
+                let lats = z * Math.sin(theta) + 0.006;
+                return {
+                    lng: lngs,
+                    lat: lats
+                };
+            },
 
-					if (count >= 100) {
-						clearInterval(timer);
-					}
-				}, 100);
-			},
+            /**
+             * 百度坐标BD-09到火星坐标GCJ02(百度 -> 高德，谷歌，腾讯坐标)
+             * lng     经度
+             * lat     纬度
+             */
+            map_bd_to_gcj(lng, lat) {
+                lng = parseFloat(lng);
+                lat = parseFloat(lat);
+                let x_pi = 3.14159265358979324 * 3000.0 / 180.0;
+                let x = lng - 0.0065;
+                let y = lat - 0.006;
+                let z = Math.sqrt(x * x + y * y) + 0.00002 * Math.sin(y * x_pi);
+                let theta = Math.atan2(y, x) + 0.000003 * Math.cos(x * x_pi);
+                let lngs = z * Math.cos(theta);
+                let lats = z * Math.sin(theta);
+                return {
+                    lng: lngs,
+                    lat: lats
+                };
+            },
 
-			/**
-			 * 火星坐标GCJ02到百度坐标BD-09(高德，谷歌，腾讯坐标 -> 百度)
-			 * lng     经度
-			 * lat     纬度
-			 */
-			map_gcj_to_bd(lng, lat) {
-				lng = parseFloat(lng);
-				lat = parseFloat(lat);
-				let x_pi = 3.14159265358979324 * 3000.0 / 180.0;
-				let x = lng;
-				let y = lat;
-				let z = Math.sqrt(x * x + y * y) + 0.00002 * Math.sin(y * x_pi);
-				let theta = Math.atan2(y, x) + 0.000003 * Math.cos(x * x_pi);
-				let lngs = z * Math.cos(theta) + 0.0065;
-				let lats = z * Math.sin(theta) + 0.006;
-				return {
-					lng: lngs,
-					lat: lats
-				};
-			},
+            /**
+             * 打开地图
+             * lng        经度
+             * lat        纬度
+             * name       地图上面显示的名称
+             * address    地图上面显示的详细地址
+             * scale      缩放比例，范围5~18
+             */
+            open_location(lng, lat, name, address, scale) {
+                // #ifdef MP-KUAISHOU
+                this.showToast('请复制地址到网页地图中查看！');
+                return false;
+                // #endif
 
-			/**
-			 * 百度坐标BD-09到火星坐标GCJ02(百度 -> 高德，谷歌，腾讯坐标)
-			 * lng     经度
-			 * lat     纬度
-			 */
-			map_bd_to_gcj(lng, lat) {
-				lng = parseFloat(lng);
-				lat = parseFloat(lat);
-				let x_pi = 3.14159265358979324 * 3000.0 / 180.0;
-				let x = lng - 0.0065;
-				let y = lat - 0.006;
-				let z = Math.sqrt(x * x + y * y) + 0.00002 * Math.sin(y * x_pi);
-				let theta = Math.atan2(y, x) + 0.000003 * Math.cos(x * x_pi);
-				let lngs = z * Math.cos(theta);
-				let lats = z * Math.sin(theta);
-				return {
-					lng: lngs,
-					lat: lats
-				};
-			},
+                if (lng == undefined || lat == undefined || lng == '' || lat == '') {
+                    this.showToast('坐标有误');
+                    return false;
+                }
 
-			/**
-			 * 打开地图
-			 * lng        经度
-			 * lat        纬度
-			 * name       地图上面显示的名称
-			 * address    地图上面显示的详细地址
-			 * scale      缩放比例，范围5~18
-			 */
-			open_location(lng, lat, name, address, scale) {
-				// #ifdef MP-KUAISHOU
-				this.showToast('请复制地址到网页地图中查看！');
-				return false;
-				// #endif
+                // 转换坐标打开位置
+                uni.openLocation({
+                    name: name || '地理位置',
+                    address: address || '',
+                    scale: scale || 18,
+                    longitude: parseFloat(lng),
+                    latitude: parseFloat(lat)
+                });
+            },
 
-				if (lng == undefined || lat == undefined || lng == '' || lat == '') {
-					this.showToast('坐标有误');
-					return false;
-				}
+            // uuid生成
+            uuid() {
+                var d = new Date().getTime();
+                return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
+                    var r = (d + Math.random() * 16) % 16 | 0;
+                    d = Math.floor(d / 16);
+                    return (c == 'x' ? r : r & 0x3 | 0x8).toString(16);
+                });
+            },
 
-				// 转换坐标打开位置
-				uni.openLocation({
-					name: name || '地理位置',
-					address: address || '',
-					scale: scale || 18,
-					longitude: parseFloat(lng),
-					latitude: parseFloat(lat)
-				});
-			},
+            // 获取当前uuid
+            request_uuid() {
+                var uuid = uni.getStorageSync(this.data.cache_user_uuid_key) || null;
+                if (uuid == null) {
+                    uuid = this.uuid();
+                    uni.setStorage({
+                        key: this.data.cache_user_uuid_key,
+                        data: uuid,
+                        fail: () => {
+                            this.showToast('uuid缓存失败');
+                        }
+                    });
+                }
+                return uuid;
+            },
 
-			// uuid生成
-			uuid() {
-				var d = new Date().getTime();
-				return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
-					var r = (d + Math.random() * 16) % 16 | 0;
-					d = Math.floor(d / 16);
-					return (c == 'x' ? r : r & 0x3 | 0x8).toString(16);
-				});
-			},
+            // 链接地址事件
+            url_event(e) {
+                var value = e.currentTarget.dataset.value || null;
+                var is_redirect = parseInt(e.currentTarget.dataset.redirect || 0) == 1;
+                this.url_open(value, is_redirect);
+            },
 
-			// 获取当前uuid
-			request_uuid() {
-				var uuid = uni.getStorageSync(this.data.cache_user_uuid_key) || null;
-				if (uuid == null) {
-					uuid = this.uuid();
-					uni.setStorage({
-						key: this.data.cache_user_uuid_key,
-						data: uuid,
-						fail: () => {
-							this.showToast('uuid缓存失败');
-						}
-					});
-				}
-				return uuid;
-			},
-
-			// 链接地址事件
-			url_event(e) {
-				var value = e.currentTarget.dataset.value || null;
-				var is_redirect = parseInt(e.currentTarget.dataset.redirect || 0) == 1;
-				this.url_open(value, is_redirect);
-			},
-
-			// url打开
-			url_open(value, is_redirect = false) {
-				if ((value || null) != null) {
+            // url打开
+            url_open(value, is_redirect = false) {
+                if ((value || null) != null) {
 					// web地址
 					var http_arr = ['http:/', 'https:'];
-					if (http_arr.indexOf(value.substr(0, 6)) != -1) {
-						this.open_web_view(value);
+                    if (http_arr.indexOf(value.substr(0, 6)) != -1) {
+                        this.open_web_view(value);
 
-						// 打开外部小程序协议
-					} else if (value.substr(0, 8) == 'appid://') {
+					// 打开外部小程序协议
+					} else if(value.substr(0, 8) == 'appid://') {
 						uni.navigateToMiniProgram({
-							appId: value.substr(8)
+						    appId: value.substr(8)
 						});
 
-						// 地图协议
-					} else if (value.substr(0, 6) == 'map://') {
+					// 地图协议
+					} else if(value.substr(0, 6) == 'map://') {
 						var values = value.substr(6).split('|');
 						if (values.length != 4) {
-							this.showToast('事件值格式有误');
-							return false;
+						    this.showToast('事件值格式有误');
+						    return false;
 						}
 						this.open_location(values[2], values[3], values[0], values[1]);
 
-						// 电话协议
-					} else if (value.substr(0, 6) == 'tel://') {
+					// 电话协议
+					} else if(value.substr(0, 6) == 'tel://') {
 						this.call_tel(value.substr(6));
 
-						// 默认切换或跳转页面
-					} else {
-						if (this.is_tabbar_pages(value)) {
+					// 默认切换或跳转页面
+                    } else {
+                        if (this.is_tabbar_pages(value)) {
 							var temp = value.split('?');
-							if (temp.length > 1 && (temp[1] || null) != null) {
+							if(temp.length > 1 && (temp[1] || null) != null)
+							{
 								value = temp[0];
 								var query = this.url_params_to_json(temp[1]);
 								uni.setStorageSync(this.data.cache_page_tabbar_switch_params, query);
 							}
-							uni.switchTab({
-								url: value
-							});
-						} else {
-							if (is_redirect) {
-								uni.redirectTo({
-									url: value
-								});
-							} else {
-								uni.navigateTo({
-									url: value
-								});
-							}
-						}
-					}
-				}
-			},
+                            uni.switchTab({
+                                url: value
+                            });
+                        } else {
+                            if(is_redirect) {
+                                uni.redirectTo({
+                                    url: value
+                                });
+                            } else {
+                                uni.navigateTo({
+                                    url: value
+                                });
+                            }
+                        }
+                    }
+                }
+            },
 
-			// 文本事件
-			text_event_handle(e) {
-				var event = e.currentTarget.dataset.event || null;
-				if (event != null) {
-					var value = e.currentTarget.dataset.value;
-					switch (event) {
-						// 拨打电话
-						case 'tel':
-							this.call_tel(value);
-							break;
-							// 复制文本
-						case 'copy':
-							this.text_copy_event(value);
-							break;
-					}
-				}
-			},
+            // 文本事件
+            text_event_handle(e) {
+                var event = e.currentTarget.dataset.event || null;
+                if(event != null) {
+                    var value = e.currentTarget.dataset.value;
+                    switch(event) {
+                        // 拨打电话
+                        case 'tel' :
+                            this.call_tel(value);
+                            break;
+                        // 复制文本
+                        case 'copy' :
+                            this.text_copy_event(value);
+                            break;
+                    }
+                }
+            },
 
-			// 剪贴板
-			text_copy_event(data) {
-				var value = (typeof(data) == 'object') ? (data.currentTarget.dataset.value || null) : (data || null);
-				if (value != null) {
-					var self = this;
-					uni.setClipboardData({
-						data: value,
-						success(res) {
-							uni.getClipboardData({
-								success(res) {
-									self.showToast('复制成功', 'success');
-								}
-							});
-						}
-					});
-				} else {
-					this.showToast('复制内容为空');
-				}
-			},
+            // 剪贴板
+            text_copy_event(data) {
+                var value = (typeof(data) == 'object') ? (data.currentTarget.dataset.value || null) : (data || null);
+                if (value != null) {
+                    var self = this;
+                    uni.setClipboardData({
+                        data: value,
+                        success(res) {
+                            uni.getClipboardData({
+                                success(res) {
+                                    self.showToast('复制成功', 'success');
+                                }
+                            });
+                        }
+                    });
+                } else {
+                    this.showToast('复制内容为空');
+                }
+            },
 
-			// 图片预览
-			image_show_event(e) {
-				var value = e.currentTarget.dataset.value || null;
-				if (value != null) {
-					uni.previewImage({
-						current: value,
-						urls: [value]
-					});
-				} else {
-					this.showToast('图片地址为空');
-				}
-			},
+            // 图片预览
+            image_show_event(e) {
+                var value = e.currentTarget.dataset.value || null;
+                if (value != null) {
+                    uni.previewImage({
+                        current: value,
+                        urls: [value]
+                    });
+                } else {
+                    this.showToast('图片地址为空');
+                }
+            },
 
-			// 静态文件url地址
-			get_static_url(type, is_plugins) {
-				// 默认公共地址
-				if ((type || null) == null) {
-					type = 'common';
-				}
+            // 静态文件url地址
+            get_static_url(type, is_plugins) {
+                // 默认公共地址
+                if((type || null) == null) {
+                    type = 'common';
+                }
+                
+                // 是否插件
+                if((is_plugins || false) == true) {
+                    // 根据配置的静态url地址+插件标识符
+                    return this.data.static_url+'static/plugins/images/'+type+'/';
+                } else {
+                    // 根据配置的静态url地址+主题标识+参数类型组合远程静态文件地址
+                    return this.data.static_url+'static/app/'+this.data.default_theme+'/'+type+'/';
+                }
+            },
+            
+            // rpx转px
+            rpx_to_px(value) {
+                return ((value || 0) == 0) ? 0 : parseInt(value) / 750 * parseInt(this.get_system_info('windowWidth', 0));
+            },
+            
+            // px转rpx
+            px_to_rpx(value) {
+                return ((value || 0) == 0) ? 0 : parseInt(value) * 750 / parseInt(this.get_system_info('windowWidth', 0));
+            },
 
-				// 是否插件
-				if ((is_plugins || false) == true) {
-					// 根据配置的静态url地址+插件标识符
-					return this.data.static_url + 'static/plugins/images/' + type + '/';
-				} else {
-					var theme = this.get_theme_value();
-					// 根据配置的静态url地址+主题标识+参数类型组合远程静态文件地址
-					return this.data.static_url + 'static/app/' + theme + '/' + type + '/';
-				}
-			},
-
-			// rpx转px
-			rpx_to_px(value) {
-				return ((value || 0) == 0) ? 0 : parseInt(value) / 750 * parseInt(this.get_system_info('windowWidth', 0));
-			},
-
-			// px转rpx
-			px_to_rpx(value) {
-				return ((value || 0) == 0) ? 0 : parseInt(value) * 750 / parseInt(this.get_system_info('windowWidth', 0));
-			},
-
-			// 终端类型
-			application_client() {
-				var type = '';
-				// #ifdef APP
-				type = 'app';
-				// #endif
+            // 终端类型
+            application_client() {
+                var type = '';
+                // #ifdef APP
+                    type = 'app';
+                // #endif
 				// #ifdef H5
-				type = 'h5';
+				    type = 'h5';
 				// #endif
-				// #ifdef MP
-				type = 'mp';
-				// #endif
-				return type;
-			},
+                // #ifdef MP
+                    type = 'mp';
+                // #endif
+                return type;
+            },
 
-			// 终端类型值
-			application_client_type() {
-				var value = '';
-				// #ifdef MP-WEIXIN
-				value = 'weixin';
-				// #endif
-				// #ifdef MP-ALIPAY
-				value = 'alipay';
-				// #endif
-				// #ifdef MP-BAIDU
-				value = 'baidu';
-				// #endif
-				// #ifdef MP-QQ
-				value = 'qq';
-				// #endif
-				// #ifdef MP-TOUTIAO
-				value = 'toutiao';
-				// #endif
-				// #ifdef MP-KUAISHOU
-				value = 'kuaishou';
-				// #endif
-				// #ifdef H5
-				value = 'h5';
-				// #endif
-				return value;
-			},
+            // 终端类型值
+            application_client_type() {
+                var value = '';
+                // #ifdef MP-WEIXIN
+                    value = 'weixin';
+                // #endif
+                // #ifdef MP-ALIPAY
+                    value = 'alipay';
+                // #endif
+                // #ifdef MP-BAIDU
+                    value = 'baidu';
+                // #endif
+                // #ifdef MP-QQ
+                    value = 'qq';
+                // #endif
+                // #ifdef MP-TOUTIAO
+                    value = 'toutiao';
+                // #endif
+                // #ifdef MP-KUAISHOU
+                    value = 'kuaishou';
+                // #endif
+                // #ifdef H5
+                    value = 'h5';
+                // #endif
+                return value;
+            },
 
-			// 授权验证
-			auth_check(object, method, scope, msg) {
-				var self = this;
-				uni.getSetting({
-					success(res) {
-						if (!res.authSetting[scope]) {
-							uni.authorize({
-								scope: scope,
-								success(res) {
-									if (typeof object === 'object' && (method || null) != null) {
-										object[method](1);
-									}
-								},
-								fail(res) {
-									self.showToast(msg || '请打开授权');
-									setTimeout(function() {
-										uni.openSetting();
-									}, 1000);
-								}
-							});
-						} else {
-							if (typeof object === 'object' && (method || null) != null) {
-								object[method](1);
-							}
-						}
-					}
-				});
-			},
+            // 授权验证
+            auth_check(object, method, scope, msg) {
+                var self = this;
+                uni.getSetting({
+                    success(res) {
+                        if (!res.authSetting[scope]) {
+                            uni.authorize({
+                                scope: scope,
+                                success (res) {
+                                    if (typeof object === 'object' && (method || null) != null) {
+                                        object[method](1);
+                                    }
+                                },
+                                fail (res) {
+                                    self.showToast(msg || '请打开授权');
+                                    setTimeout(function() {
+                                        uni.openSetting();
+                                    }, 1000);
+                                }
+                            });
+                        } else {
+                            if (typeof object === 'object' && (method || null) != null) {
+                                object[method](1);
+                            }
+                        }
+                    }
+                });
+            },
 
-			// 窗口宽度处理
-			window_width_handle(width) {
-				// #ifdef H5 || APP
-				if (width > 800) {
-					width = 800;
-				}
-				// #endif
-				return width;
-			},
+            // 窗口宽度处理
+            window_width_handle(width) {
+                // #ifdef H5 || APP
+                if(width > 800) {
+                    width = 800;
+                }
+                // #endif
+                return width;
+            },
 
-			// 窗口高度处理
-			window_height_handle(system) {
-				var height = system.windowHeight;
-				// 状态栏
-				if (system.statusBarHeight > 0) {
-					height += system.statusBarHeight;
-				}
-				// 导航栏
-				if (system.windowTop > 0) {
-					height += system.windowTop;
-				}
-				// 底部菜单
-				if (system.windowBottom > 0) {
-					height += system.windowBottom;
-				}
-				return height;
-			},
+            // 窗口高度处理
+            window_height_handle(system) {
+                var height = system.windowHeight;
+                // 状态栏
+                if(system.statusBarHeight > 0) {
+                    height += system.statusBarHeight;
+                }
+                // 导航栏
+                if(system.windowTop > 0) {
+                    height += system.windowTop;
+                }
+                // 底部菜单
+                if(system.windowBottom > 0) {
+                    height += system.windowBottom;
+                }
+                return height;
+            },
 
-			// 获取当前页面地址
-			// is_whole 完整地址（?后面的参数）
-			get_page_url(is_whole = true) {
-				// #ifdef MP || APP
-				var url = this.current_page();
-				// #endif
-				// #ifdef H5
-				var url = window.location.href;
-				// #endif
-				if (is_whole == false) {
-					var temp = url.split('?');
-					url = temp[0];
-				}
-				return url;
-			},
+            // 获取当前页面地址
+            // is_whole 完整地址（?后面的参数）
+            get_page_url(is_whole = true) {
+                // #ifdef MP || APP
+                var url = this.current_page();
+                // #endif
+                // #ifdef H5
+                var url = window.location.href;
+                // #endif
+                if(is_whole == false) {
+                    var temp = url.split('?');
+                    url = temp[0];
+                }
+                return url;
+            },
 
-			// 是否微信环境
-			is_weixin_env() {
-				var agent = navigator.userAgent.toLowerCase();
-				if (agent.match(/MicroMessenger/i) == 'micromessenger') {
-					return true;
-				}
-				return false;
-			},
+            // 是否微信环境
+            is_weixin_env() {
+                var agent = navigator.userAgent.toLowerCase();
+                if(agent.match(/MicroMessenger/i) == 'micromessenger') {
+                    return true;
+                }
+                return false;
+            },
 
-			// 用户微信webopenid是否存在
-			is_user_weixin_web_openid(order_ids, payment_id = 0) {
-				// 微信环境判断是否已有web_openid、不存在则跳转到插件进行授权
-				if (this.is_weixin_env()) {
-					var web_openid = this.get_user_cache_info('weixin_web_openid') || null;
-					if (web_openid == null) {
-						// 已经授权则重新刷新用户信息
-						var params = this.get_launch_cache_info();
-						if (params != null && (params.is_weixin_auth_web_openid || 0) == 1) {
-							uni.showLoading({
-								title: "处理中..."
-							});
-							uni.request({
-								url: this.get_request_url("tokenuserinfo", "user"),
-								method: "POST",
-								data: {},
-								dataType: "json",
-								success: res => {
-									uni.hideLoading();
-									if (res.data.code == 0) {
-										uni.setStorageSync(this.data.cache_user_info_key, res.data.data);
-									} else {
-										this.showToast(res.data.msg);
-									}
-								},
-								fail: () => {
-									uni.hideLoading();
-									this.showToast("服务器请求出错");
-								}
-							});
-							return true;
-						} else {
-							uni.setStorageSync(this.data.cache_page_pay_key, {
-								order_ids: (typeof order_ids == 'array') ? order_ids.join(',') : order_ids,
-								payment_id: payment_id
-							});
-							var page_url = this.get_page_url();
-							page_url += (page_url.indexOf('?') == -1) ? '?' : '&';
-							page_url += 'is_weixin_auth_web_openid=1';
-							var request_url = encodeURIComponent(base64.encode(page_url));
-							var url = this.get_request_url("index", "pay", "weixinwebauthorization", "request_url=" + request_url, "index").replace('&ajax=ajax', '');
-							window.location.href = url;
-						}
-						return false;
-					}
-				}
-				return true;
-			},
+            // 用户微信webopenid是否存在
+            is_user_weixin_web_openid(order_ids, payment_id = 0) {
+                // 微信环境判断是否已有web_openid、不存在则跳转到插件进行授权
+                if(this.is_weixin_env()) {
+                    var web_openid = this.get_user_cache_info('weixin_web_openid') || null;
+                    if(web_openid == null) {
+                        // 已经授权则重新刷新用户信息
+                        var params = this.get_launch_cache_info();
+                        if(params != null && (params.is_weixin_auth_web_openid || 0) == 1) {
+                            uni.showLoading({
+                                title: "处理中..."
+                            });
+                            uni.request({
+                                url: this.get_request_url("tokenuserinfo", "user"),
+                                method: "POST",
+                                data: {},
+                                dataType: "json",
+                                success: res => {
+                                    uni.hideLoading();
+                                    if (res.data.code == 0) {
+                                        uni.setStorageSync(this.data.cache_user_info_key, res.data.data);
+                                    } else {
+                                        this.showToast(res.data.msg);
+                                    }
+                                },
+                                fail: () => {
+                                    uni.hideLoading();
+                                    this.showToast("服务器请求出错");
+                                }
+                            });
+                            return true;
+                        } else {
+                            uni.setStorageSync(this.data.cache_page_pay_key,  {
+                                order_ids: (typeof order_ids == 'array') ? order_ids.join(',') : order_ids,
+                                payment_id: payment_id
+                            });
+                            var page_url = this.get_page_url();
+                                page_url += (page_url.indexOf('?') == -1) ? '?' : '&';
+                                page_url += 'is_weixin_auth_web_openid=1';
+                            var request_url = encodeURIComponent(base64.encode(page_url));
+                            var url = this.get_request_url("index", "pay", "weixinwebauthorization", "request_url="+request_url, "index").replace('&ajax=ajax', '');
+                            window.location.href = url;
+                        }
+                        return false;
+                    }
+                }
+                return true;
+            },
 
-			// app标题
-			get_application_title() {
-				var value = null;
-				// 根据终端类型获取对应数据
-				var type = this.application_client_type() || null;
-				if (type !== null) {
-					value = this.get_config('config.common_app_mini_' + type + '_title') || null;
-				}
-				// 获取公共数据
-				if (value === null) {
-					value = this.get_config('config.home_site_name', this.data.application_title);
-				}
-				return value;
-			},
+            // app标题
+            get_application_title() {
+                var value = null;
+                // 根据终端类型获取对应数据
+                var type = this.application_client_type() || null;
+                if(type !== null) {
+                    value = this.get_config('config.common_app_mini_'+type+'_title') || null;
+                }
+                // 获取公共数据
+                if(value === null) {
+                    value = this.get_config('config.home_site_name', this.data.application_title);
+                }
+                return value;
+            },
 
-			// app描述
-			get_application_describe() {
-				var value = null;
-				// 根据终端类型获取对应数据
-				var type = this.application_client_type() || null;
-				if (type !== null) {
-					value = this.get_config('config.common_app_mini_' + type + '_describe') || null;
-				}
-				// 获取公共数据
-				if (value === null) {
-					value = this.data.application_describe;
-				}
-				return value;
-			},
+            // app描述
+            get_application_describe() {
+                var value = null;
+                // 根据终端类型获取对应数据
+                var type = this.application_client_type() || null;
+                if(type !== null) {
+                    value = this.get_config('config.common_app_mini_'+type+'_describe') || null;
+                }
+                // 获取公共数据
+                if(value === null) {
+                    value = this.data.application_describe;
+                }
+                return value;
+            },
 
-			// applogo
-			get_application_logo() {
-				var logo = this.data.application_logo || null;
-				if (logo == null) {
-					logo = this.get_config('config.home_site_logo_wap');
-				}
-				return logo
-			},
+            // applogo
+            get_application_logo() {
+                var logo = this.data.application_logo || null;
+                if(logo == null) {
+                    logo = this.get_config('config.home_site_logo_wap');
+                }
+                return logo
+            },
 
-			// 分享内容处理
-			share_content_handle(data) {
-				// 获取插件配置信息
-				var share_config = this.get_config('plugins_base.share.data') || {};
-				var result = {
-					title: data.title || share_config.title || this.get_application_title(),
-					desc: data.desc || share_config.desc || this.get_application_describe(),
-					path: data.path || this.data.tabbar_pages[0],
-					query: this.share_query_handle(data.query || ''),
-					img: data.img || share_config.pic || this.get_config('config.home_site_logo_square')
-				};
-				result['url'] = this.get_page_url();
-				// #ifdef H5
-				result['url'] = result.url.split('#')[0] + '#' + ((result.path.substr(0, 1) == '/') ? '' : '/') + result
-					.path + result.query;
-				// #endif
-				return result;
-			},
+            // 正方形logo
+            get_application_logo_square() {
+                return this.get_config('config.home_site_logo_square');
+            },
 
-			// 分享参数处理
-			share_query_handle(query) {
-				if ((query || null) == null || query.indexOf('referrer') == -1) {
-					var user_id = parseInt(this.get_user_cache_info('id', 0)) || 0;
-					if (user_id > 0) {
-						var join = ((query || null) == null) ? '' : '&';
-						query += join + 'referrer=' + user_id;
-					}
-				}
-				return ((query || null) == null) ? '' : '?' + query;
-			},
+            // 分享内容处理
+            share_content_handle(data) {
+                // 获取插件配置信息
+                var share_config = this.get_config('plugins_base.share.data') || {};
+                var result = {
+                    title: data.title || share_config.title || this.get_application_title(),
+                    desc: data.desc || share_config.desc || this.get_application_describe(),
+                    path: data.path || this.data.tabbar_pages[0],
+                    query: this.share_query_handle(data.query || ''),
+                    img: data.img || share_config.pic || this.get_config('config.home_site_logo_square')
+                };
+                result['url'] = this.get_page_url();
+                // #ifdef H5
+                result['url'] = result.url.split('#')[0] + '#' + ((result.path.substr(0 ,1) == '/') ? '' : '/') + result.path + result.query;
+                // #endif
+                return result;
+            },
 
-			// 是否朋友圈单页访问提示
-			is_single_page_check() {
-				if (this.is_current_single_page() == 1) {
-					this.showToast('请前往小程序使用完整服务');
-					return false;
-				}
-				return true;
-			},
+            // 分享参数处理
+            share_query_handle(query) {
+                if((query || null) == null || query.indexOf('referrer') == -1) {
+                    var user_id = parseInt(this.get_user_cache_info('id', 0)) || 0;
+                    if(user_id > 0) {
+                        var join = ((query || null) == null) ? '' : '&';
+                        query += join+'referrer='+user_id;
+                    }
+                }
+                return ((query || null) == null) ? '' : '?'+query;
+            },
 
-			// 调用页面方法
-			get_page_object(page) {
-				var result = [];
-				var pages = getCurrentPages();
-				for (var i = 0; i < pages.length; i++) {
-					if (pages[i]['route'] == page) {
-						result.push(pages[i]);
-					}
-				}
-				return result;
-			},
+            // 是否朋友圈单页访问提示
+            is_single_page_check() {
+                if(this.is_current_single_page() == 1) {
+                    this.showToast('请前往小程序使用完整服务');
+                    return false;
+                }
+                return true;
+            },
 
-			// 当前页面地址
-			current_page() {
-				// 来源地址、拼接当前小程序页面
-				var pages = getCurrentPages();
-				var page = pages[pages.length - 1];
-				return this.page_url_handle(page);
-			},
+            // 调用页面方法
+            get_page_object(page) {
+                var result = [];
+                var pages = getCurrentPages();
+                for(var i=0; i<pages.length; i++) {
+                    if(pages[i]['route'] == page) {
+                        result.push(pages[i]);
+                    }
+                }
+                return result;
+            },
 
-			// 上一页页面地址
-			prev_page() {
-				var value = null;
-				var pages = getCurrentPages();
-				var length = pages.length;
-				if (length > 1) {
-					value = this.page_url_handle(pages[length - 2]);
-				}
-				return value;
-			},
+            // 当前页面地址
+            current_page() {
+                // 来源地址、拼接当前小程序页面
+                var pages = getCurrentPages();
+                var page = pages[pages.length-1];
+                return this.page_url_handle(page);
+            },
 
-			// 返回上一页、则回到shouy 
-			page_back_prev_event() {
-				var prev_page = this.prev_page();
-				if (prev_page == null) {
-					uni.switchTab({
-						url: this.data.tabbar_pages[0]
-					});
-				} else {
-					uni.navigateBack();
-				}
-			},
+            // 上一页页面地址
+            prev_page() {
+                var value = null;
+                var pages = getCurrentPages();
+                var length = pages.length;
+                if(length > 1) {
+                    value = this.page_url_handle(pages[length-2]);
+                }
+                return value;
+            },
 
-			// 页面地址处理
-			page_url_handle(page) {
-				var route = page.route;
-				var options = page.options || {};
-				var query = '';
-				if (JSON.stringify(options) != '{}') {
-					for (var i in options) {
-						query += '&' + i + '=' + options[i];
-					}
-				}
-				if ((query || null) != null) {
-					route += '?' + query.substr(1);
-				}
-				return route;
-			},
+            // 返回上一页、则回到shouy 
+            page_back_prev_event() {
+                var prev_page = this.prev_page();
+                if(prev_page == null) {
+                    uni.switchTab({url: this.data.tabbar_pages[0]});
+                } else {
+                    uni.navigateBack();
+                }
+            },
 
-			// 进入客服
-			chat_entry_handle(url) {
-				if ((url || null) == null) {
-					this.showToast("客服地址有误");
-				} else {
-					// 拼接基础参数
-					url = this.request_params_handle(url);
+            // 页面地址处理
+            page_url_handle(page) {
+                if((page || null) == null) {
+                    return '';
+                }
+                var route = page.route;
+                var options = page.options || {};
+                var query = '';
+                if(JSON.stringify(options) != '{}') {
+                    for(var i in options) {
+                        query += '&'+i+'='+options[i];
+                    }
+                }
+                if((query || null) != null) {
+                    route += '?'+query.substr(1);
+                }
+                return route;
+            },
 
-					// 拼接当前页面地址
-					var route = this.current_page();
-					url += '&source=' + encodeURIComponent(base64.encode(route).replace(new RegExp(/=/g), ''));
+            // 进入客服
+            chat_entry_handle(url) {
+                if((url || null) == null) {
+                    this.showToast("客服地址有误");
+                } else {
+                    // 拼接基础参数
+                    url = this.request_params_handle(url);
 
-					// 打开webview
-					this.open_web_view(url);
-				}
-			},
+                    // 拼接当前页面地址
+                    var route = this.current_page();
+                    url += '&source='+encodeURIComponent(base64.encode(route).replace(new RegExp(/=/g), ''));
 
-			// 用户自动登录处理
-			user_auto_login_handle() {
-				// #ifdef H5
-				var user = this.get_user_cache_info();
-				if (user == null) {
-					var params = this.get_launch_cache_info() || {};
-					var config = this.get_config('plugins_base.thirdpartylogin.data') || null;
-					var data = this.get_config('plugins_thirdpartylogin_data') || null;
-					var url = null;
-					// 是否微信环境
-					if ((params.thirdpartylogin || null) == null && config != null && data != null && this
-						.is_weixin_env()) {
-						var is_auto = config.weixin_is_env_auto_login || 0;
-						var weixin = data.weixin || null;
-						if (is_auto != 0 && weixin != null) {
-							url = weixin.login_url;
-						}
-					}
+                    // 打开webview
+                    this.open_web_view(url);
+                }
+            },
+            
+            // 用户自动登录处理
+            user_auto_login_handle() {
+                // #ifdef H5
+                var user = this.get_user_cache_info();
+                if(user == null) {
+                    var params = this.get_launch_cache_info() || {};
+                    var config = this.get_config('plugins_base.thirdpartylogin.data') || null;
+                    var data = this.get_config('plugins_thirdpartylogin_data') || null;
+                    var url = null;
+                    // 是否微信环境
+                    if((params.thirdpartylogin || null) == null && config != null && data != null && this.is_weixin_env()) {
+                        var is_auto = config.weixin_is_env_auto_login || 0;
+                        var weixin = data.weixin || null;
+                        if(is_auto != 0 && weixin != null) {
+                            url = weixin.login_url;
+                        }
+                    }
 
-					// 存在登录url则跳转登录
-					if (url != null) {
-						// 上一个页面记录
-						var page = this.current_page();
-						if (page != null) {
-							uni.setStorageSync(this.data.cache_prev_page_key, page);
-						}
+                    // 存在登录url则跳转登录
+                    if(url != null) {
+                        // 上一个页面记录
+                        var page = this.current_page();
+                        if(page != null) {
+                            uni.setStorageSync(this.data.cache_prev_page_key, page);
+                        }
 
-						// 跳转登录
-						window.location.href = url;
-					}
-				}
-				// #endif
-			},
+                        // 跳转登录
+                        window.location.href = url;
+                    }
+                }
+                // #endif
+            },
 
-			// 清除用户缓存
-			remove_user_cache_event() {
-				// 用户登录缓存
-				uni.removeStorageSync(this.data.cache_user_login_key);
-				// 用户信息缓存
-				uni.removeStorageSync(this.data.cache_user_info_key);
+            // 清除用户缓存
+            remove_user_cache_event() {
+                // 用户登录缓存
+                uni.removeStorageSync(this.data.cache_user_login_key);
+                // 用户信息缓存
+                uni.removeStorageSync(this.data.cache_user_info_key);
 
-				// 非小程序则两秒后回到首页
-				this.showToast('清除成功', 'success');
-				var url = this.data.tabbar_pages[0];
-				setTimeout(function() {
-					uni.switchTab({
-						url: url
-					});
-				}, 1500);
-			},
-			// 是否站点变灰
-			is_app_mourning() {
-				var is_app = parseInt(this.get_config('plugins_base.mourning.data.is_app', 0));
-				if (is_app == 1) {
-					// 当前时间戳
-					var time_current = Date.parse(new Date());
-					// 开始时间
-					var time_start = this.get_config('plugins_base.mourning.data.time_start') || null;
-					if (time_start != null) {
-						if (Date.parse(new Date(time_start)) > time_current) {
-							return false;
-						}
-					}
-					// 结束时间
-					var time_end = this.get_config('plugins_base.mourning.data.time_end') || null;
-					if (time_end != null) {
-						if (Date.parse(new Date(time_end)) < time_current) {
-							return false;
-						}
-					}
-					return true;
-				}
-				return false;
-			},
+                // 非小程序则两秒后回到首页
+                this.showToast('清除成功', 'success');
+                var url = this.data.tabbar_pages[0];
+                setTimeout(function() {
+                    uni.switchTab({url: url});
+                }, 1500);
+            },
 
-			// 价格符号
-			currency_symbol() {
-				return this.get_config('currency_symbol') || this.data.currency_symbol;
-			},
+            // 是否站点变灰
+            is_app_mourning() {
+                var is_app = parseInt(this.get_config('plugins_base.mourning.data.is_app', 0));
+                if(is_app == 1) {
+                    // 当前时间戳
+                    var time_current = Date.parse(new Date());
+                    // 开始时间
+                    var time_start = this.get_config('plugins_base.mourning.data.time_start') || null;
+                    if(time_start != null)
+                    {
+                        if(Date.parse(new Date(time_start)) > time_current)
+                        {
+                            return false;
+                        }
+                    }
+                    // 结束时间
+                    var time_end = this.get_config('plugins_base.mourning.data.time_end') || null;
+                    if(time_end != null)
+                    {
+                        if(Date.parse(new Date(time_end)) < time_current)
+                        {
+                            return false;
+                        }
+                    }
+                    return true;
+                }
+                return false;
+            },
 
-			// 位置权限校验
-			get_location_check(type, object, method) {
-				// #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
-				var self = this;
-				uni.getSetting({
-					success(res) {
-						if (!res.authSetting[type]) {
-							uni.authorize({
-								scope: type,
-								success(res) {
-									if (typeof object === 'object' && (method || null) != null) {
-										object[method](1);
-									}
-								},
-								fail: res => {
-									if (typeof object === 'object' && (method || null) != null) {
-										object[method](0);
-									}
-								}
-							});
-						} else {
-							if (typeof object === 'object' && (method || null) != null) {
-								object[method](1);
-							}
-						}
-					},
-					fail: res => {
-						app.globalData.showToast("请先获取授权");
-						if (typeof object === 'object' && (method || null) != null) {
-							object[method](0);
-						}
-					}
-				});
-				// #endif
-				// #ifdef MP-ALIPAY || H5 || APP
-				if (typeof object === 'object' && (method || null) != null) {
-					object[method](1);
-				}
-				// #endif
-				// #ifdef MP-KUAISHOU
-				app.globalData.showToast('不支持地理位置选择！');
-				if (typeof object === 'object' && (method || null) != null) {
-					object[method](0);
-				}
-				// #endif
-			},
+            // 价格符号
+            currency_symbol() {
+                return this.get_config('currency_symbol') || this.data.currency_symbol;
+            },
 
-			// 启动位置监听（0 打开小程序监听、1小程序后台运行也监听）
-			start_location_update(type = 0, object, method) {
-				// 先停止再调用
-				uni.stopLocationUpdate();
-				// 关闭监听
-				uni.offLocationChange();
+            // 位置权限校验
+            get_location_check(type, object, method) {
+                // #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
+                var self = this;
+                uni.getSetting({
+                    success(res) {
+                        if (!res.authSetting[type]) {
+                            uni.authorize({
+                                scope: type,
+                                success(res) {
+                                    if (typeof object === 'object' && (method || null) != null) {
+                                        object[method](1);
+                                    }
+                                },
+                                fail: res => {
+                                    if (typeof object === 'object' && (method || null) != null) {
+                                        object[method](0);
+                                    }
+                                }
+                            });
+                        } else {
+                            if (typeof object === 'object' && (method || null) != null) {
+                                object[method](1);
+                            }
+                        }
+                    },
+                    fail: res => {
+                        app.globalData.showToast("请先获取授权");
+                        if (typeof object === 'object' && (method || null) != null) {
+                            object[method](0);
+                        }
+                    }
+                });
+                // #endif
+                // #ifdef MP-ALIPAY || H5 || APP
+                if (typeof object === 'object' && (method || null) != null) {
+                    object[method](1);
+                }
+                // #endif
+                // #ifdef MP-KUAISHOU
+                app.globalData.showToast('不支持地理位置选择！');
+                if (typeof object === 'object' && (method || null) != null) {
+                    object[method](0);
+                }
+                // #endif
+            },
 
-				// 根据类型调用api
-				if (type == 0) {
-					// 打开小程序监听
-					uni.startLocationUpdate({
-						success: (res) => {
-							this.start_location_update_change(object, method);
-						},
-						fail: res => {
-							if (typeof object === 'object' && (method || null) != null) {
-								object[method]({
-									status: 0,
-									msg: res.errMsg
-								});
-							}
-						}
-					});
-				} else {
-					// 小程序后台运行监听
-					uni.startLocationUpdateBackground({
-						success: (res) => {
-							this.start_location_update_change(object, method);
-						},
-						fail: res => {
-							if (typeof object === 'object' && (method || null) != null) {
-								object[method]({
-									status: 0,
-									msg: res.errMsg
-								});
-							}
-						}
-					});
-				}
-			},
-			// 位置监听改变
-			start_location_update_change(object, method) {
-				uni.onLocationChange((res) => {
-					if (typeof object === 'object' && (method || null) != null) {
-						object[method]({
-							status: 1,
-							lng: res.longitude,
-							lat: res.latitude,
-							data: res
-						});
-					}
-				});
-			},
+            // 启动位置监听（0 打开小程序监听、1小程序后台运行也监听）
+            start_location_update(type = 0, object, method) {
+                // 先停止再调用
+                uni.stopLocationUpdate();
+                // 关闭监听
+                uni.offLocationChange();
+
+                // 根据类型调用api
+                if(type == 0) {
+                    // 打开小程序监听
+                    uni.startLocationUpdate({
+                        success: (res) => {
+                            this.start_location_update_change(object, method);
+                        },
+                        fail: res => {
+                            if (typeof object === 'object' && (method || null) != null) {
+                                object[method]({status: 0, msg: res.errMsg});
+                            }
+                        }
+                    });
+                } else {
+                    // 小程序后台运行监听
+                    uni.startLocationUpdateBackground({
+                        success: (res) => {
+                            this.start_location_update_change(object, method);
+                        },
+                        fail: res => {
+                            if (typeof object === 'object' && (method || null) != null) {
+                                object[method]({status: 0, msg: res.errMsg});
+                            }
+                        }
+                    });
+                }
+            },
+
+            // 位置监听改变
+            start_location_update_change(object, method) {
+                uni.onLocationChange((res) => {
+                    if (typeof object === 'object' && (method || null) != null) {
+                        object[method]({status: 1, lng: res.longitude, lat: res.latitude, data: res});
+                    }
+                });
+            },
+
+            // 微信隐私弹窗提示
+            weixin_privacy_setting() {
+                if(this.data.is_weixin_privacy_setting == 1) {
+                    var self = this;
+                    self.weixin_privacy_setting_timer = setInterval(function() {
+                        var page = self.get_page_url(false);
+                        if('/'+page == self.data.tabbar_pages[0]) {
+                            uni.getPrivacySetting({
+                                success: res => {
+                                    if (res.needAuthorization) {
+                                        // 需要弹出隐私协议
+                                        uni.navigateTo({
+                                            url: '/pages/common/agreement/agreement'
+                                        });
+                                    }
+                                }
+                            });
+                            // 已执行隐私方法清除定时任务
+                            clearInterval(self.weixin_privacy_setting_timer);
+                        }
+                    }, 100);
+                }
+            },
+            
 			// 获取主题
 			get_theme_value() {
 
@@ -1869,38 +1891,50 @@
 					b = parseInt(rgb[3], 16);
 				return `rgba(${r},${g},${b},${alpha})`;
 			}
-		},
+        },
 
-		/**
-		 * 小程序初始化
-		 */
-		onLaunch(params) {
-			this.globalData.set_theme_value()
-		},
+        // 初始化完成时触发（全局只触发一次）
+        onLaunch(params) {},
 
-		/**
-		 * 小程序页面显示
-		 */
-		onShow(params) {
-			// 初始化配置
-			this.globalData.init_config();
+        // 启动，或从后台进入前台显示
+        onShow(params) {
+            // 初始化配置
+            this.globalData.init_config();
 
-			// 设置设备信息
-			this.globalData.set_system_info();
+            // 设置设备信息
+            this.globalData.set_system_info();
 
-			// 参数处理+缓存
-			this.globalData.set_launch_cache_info(params);
+            // 参数处理+缓存
+            this.globalData.set_launch_cache_info(params);
 
-			// 场景值
-			this.globalData.set_scene_data(params);
-		},
+            // 场景值
+            this.globalData.set_scene_data(params);
 
-		methods: {}
-	};
+            // #ifdef MP-WEIXIN
+            // 协议验证处理
+            this.globalData.weixin_privacy_setting();
+            // #endif
+        },
+
+        // 从前台进入后台
+        onHide() {
+            // 清除微信隐私方法定时任务
+            clearInterval(this.weixin_privacy_setting_timer);
+        },
+
+        // 监听应用退出
+        onExit() {
+            // 清除微信隐私方法定时任务
+            clearInterval(this.weixin_privacy_setting_timer);
+        },
+
+        methods: {}
+    };
 </script>
 <style>
-	@import './common/css/page.css';
-	@import './common/css/business.css';
-	@import './common/css/plugins.css';
-	@import './common/css/lib.css';
+    @import './common/css/page.css';
+    @import './common/css/business.css';
+    @import './common/css/plugins.css';
+    @import './common/css/lib.css';
+    @import './common/css/theme/yellow.css';
 </style>
\ No newline at end of file
diff --git a/components/user-base/user-base.vue b/components/user-base/user-base.vue
index 7c59443b..c11177be 100644
--- a/components/user-base/user-base.vue
+++ b/components/user-base/user-base.vue
@@ -116,10 +116,15 @@
 							.interval_time)) {
 						status = false;
 					}
-					this.setData({
-						popup_status: status,
-						user: user
-					});
+
+                    // 1秒后再提示用户填写信息
+                    var self = this;
+                    setTimeout(function() {
+                        self.setData({
+                        	popup_status: status,
+                        	user: user
+                        });
+                    }, 1000);
 				}
 			},
 
diff --git a/manifest.json b/manifest.json
index 0371c3da..26960209 100644
--- a/manifest.json
+++ b/manifest.json
@@ -62,6 +62,7 @@
                 "desc" : "你的位置将用于小程序中相应业务位置服务使用"
             }
         },
+        "__usePrivacyCheck__": true,
         "plugins" : {
             // 直播（需要开通权限 https://developers.weixin.qq.com/miniprogram/dev/platform-capabilities/industry/liveplayer/live-player-plugin.html）
             // "live-player-plugin" : {
diff --git a/pages.json b/pages.json
index 5f35e077..e3d9b7b4 100644
--- a/pages.json
+++ b/pages.json
@@ -1,1022 +1,1060 @@
-{
-	"pages": [{
-			"path": "pages/index/index",
-			"style": {
-				// #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || H5 || APP
-				"navigationStyle": "custom",
-				// #endif
-				// #ifndef MP-ALIPAY
-				"navigationBarTitleText": "ShopXO",
-				// #endif
-				// #ifdef MP-ALIPAY
-				"transparentTitle": "always",
-				"titlePenetrate": "YES",
-				"navigationBarTitleText": "",
-				// #endif
-				"enablePullDownRefresh": true,
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/goods-category/goods-category",
-			"style": {
-				// #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || H5 || APP
-				"navigationStyle": "custom",
-				// #endif
-				// #ifndef MP-ALIPAY
-				"navigationBarTitleText": "商品分类",
-				// #endif
-				// #ifdef MP-ALIPAY
-				"transparentTitle": "always",
-				"titlePenetrate": "YES",
-				"navigationBarTitleText": "",
-				// #endif
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/cart/cart",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "购物车"
-			}
-		},
-		{
-			"path": "pages/user/user",
-			"style": {
-				// #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || H5 || APP
-				"navigationStyle": "custom",
-				// #endif
-				// #ifndef MP-ALIPAY
-				"navigationBarTitleText": "用户中心",
-				// #endif
-				// #ifdef MP-ALIPAY
-				"transparentTitle": "always",
-				"titlePenetrate": "YES",
-				"navigationBarTitleText": "",
-				// #endif
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/cart-page/cart-page",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "购物车"
-			}
-		},
-		{
-			"path": "pages/buy/buy",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "订单确认"
-			}
-		},
-		{
-			"path": "pages/web-view/web-view",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/login/login",
-			"style": {
-				"enablePullDownRefresh": false,
-				"navigationBarTitleText": "登录"
-			}
-		},
-		{
-			"path": "pages/paytips/paytips",
-			"style": {
-				"enablePullDownRefresh": false,
-				"navigationBarTitleText": "安全支付"
-			}
-		},
-		{
-			"path": "pages/goods-search/goods-search",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "商品搜索"
-			}
-		},
-		{
-			"path": "pages/goods-detail/goods-detail",
-			"style": {
-				// #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU
-				"navigationStyle": "custom",
-				// #endif
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "商品详情"
-			}
-		},
-		{
-			"path": "pages/goods-comment/goods-comment",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "商品评价"
-			}
-		},
-		{
-			"path": "pages/user-address/user-address",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "我的地址"
-			}
-		},
-		{
-			"path": "pages/user-address-save/user-address-save",
-			"style": {
-				"enablePullDownRefresh": false,
-				"navigationBarTitleText": "地址编辑"
-			}
-		},
-		{
-			"path": "pages/user-order/user-order",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "我的订单"
-			}
-		},
-		{
-			"path": "pages/user-order-detail/user-order-detail",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "订单详情"
-			}
-		},
-		{
-			"path": "pages/user-order-comments/user-order-comments",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "订单评价"
-			}
-		},
-		{
-			"path": "pages/user-favor/user-favor",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "商品收藏"
-			}
-		},
-		{
-			"path": "pages/user-answer-list/user-answer-list",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "我的留言"
-			}
-		},
-		{
-			"path": "pages/answer-list/answer-list",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "问答广场"
-			}
-		},
-		{
-			"path": "pages/answer-form/answer-form",
-			"style": {
-				"enablePullDownRefresh": false,
-				"navigationBarTitleText": "留言"
-			}
-		},
-		{
-			"path": "pages/message/message",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "消息"
-			}
-		},
-		{
-			"path": "pages/user-integral/user-integral",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "积分明细"
-			}
-		},
-		{
-			"path": "pages/user-goods-browse/user-goods-browse",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "我的足迹"
-			}
-		},
-		{
-			"path": "pages/user-orderaftersale/user-orderaftersale",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "退款/售后"
-			}
-		},
-		{
-			"path": "pages/user-orderaftersale-detail/user-orderaftersale-detail",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "订单售后"
-
-			}
-		},
-		{
-			"path": "pages/extraction-address/extraction-address",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "自提地址"
-			}
-		},
-		{
-			"path": "pages/common/open-setting-location/open-setting-location",
-			"style": {
-				// #ifndef MP-TOUTIAO
-				"navigationStyle": "custom",
-				// #endif
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/design/design",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "页面设计"
-			}
-		},
-		{
-			"path": "pages/error/error",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "温馨提示"
-			}
-		},
-		{
-			"path": "pages/article-category/article-category",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "所有文章"
-			}
-		},
-		{
-			"path": "pages/article-detail/article-detail",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "文章详情"
-			}
-		},
-		{
-			"path": "pages/setup/setup",
-			"style": {
-				"enablePullDownRefresh": false,
-				"navigationBarTitleText": "设置"
-			}
-		},
-		{
-			"path": "pages/personal/personal",
-			"style": {
-				"enablePullDownRefresh": false,
-				"navigationBarTitleText": "个人资料"
-			}
-		},
-		{
-			"path": "pages/logout/logout",
-			"style": {
-				"enablePullDownRefresh": false,
-				"navigationBarTitleText": "账号注销"
-			}
-		}
-	],
-	"subPackages": [{
-			"root": "pages/plugins/seckill",
-			"pages": [{
-				"path": "index/index",
-				"style": {
-					"enablePullDownRefresh": true,
-					"navigationBarTitleText": "限时秒杀"
-				}
-			}]
-		},
-		{
-			"root": "pages/plugins/coupon",
-			"pages": [{
-					"path": "index/index",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "领券中心"
-					}
-				},
-				{
-					"path": "shop/shop",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "店铺领券中心"
-					}
-				},
-				{
-					"path": "user/user",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "我的卡券"
-					}
-				}
-			]
-		},
-		{
-			"root": "pages/plugins/membershiplevelvip",
-			"pages": [{
-					"path": "index/index",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "会员VIP"
-					}
-				},
-				{
-					"path": "buy/buy",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "开通会员"
-					}
-				},
-				{
-					"path": "user/user",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "我的会员"
-					}
-				},
-				{
-					"path": "order/order",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "开通订单"
-					}
-				},
-				{
-					"path": "order-detail/order-detail",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "订单详情"
-					}
-				},
-				{
-					"path": "profit/profit",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "收益明细"
-					}
-				},
-				{
-					"path": "profit-detail/profit-detail",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "收益详情"
-					}
-				},
-				{
-					"path": "statistics/statistics",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "数据统计"
-					}
-				},
-				{
-					"path": "poster/poster",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "推广返利"
-					}
-				},
-				{
-					"path": "team/team",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "我的团队"
-					}
-				},
-				{
-					"path": "member-code/member-code",
-					"style": {
-						"enablePullDownRefresh": false,
-						"navigationBarTitleText": "会员码"
-					}
-				}
-			]
-		},
-		{
-			"root": "pages/plugins/distribution",
-			"pages": [{
-					"path": "user/user",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "我的分销"
-					}
-				},
-				{
-					"path": "order/order",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "分销订单"
-					}
-				},
-				{
-					"path": "order-detail/order-detail",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "订单详情"
-					}
-				},
-				{
-					"path": "profit/profit",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "收益明细"
-					}
-				},
-				{
-					"path": "profit-detail/profit-detail",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "收益详情"
-					}
-				},
-				{
-					"path": "team/team",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "我的团队"
-					}
-				},
-				{
-					"path": "map/map",
-					"style": {
-						"enablePullDownRefresh": false,
-						"navigationBarTitleText": "客户分布"
-					}
-				},
-				{
-					"path": "recommend-list/recommend-list",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "我的推荐宝"
-					}
-				},
-				{
-					"path": "recommend-detail/recommend-detail",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "推荐宝详情"
-					}
-				},
-				{
-					"path": "recommend-form/recommend-form",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "推荐宝添加/编辑"
-					}
-				},
-				{
-					"path": "poster/poster",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "推广返利"
-					}
-				},
-				{
-					"path": "extraction/extraction",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "取货点"
-					}
-				},
-				{
-					"path": "extraction-apply/extraction-apply",
-					"style": {
-						"enablePullDownRefresh": false,
-						"navigationBarTitleText": "取货点信息"
-					}
-				},
-				{
-					"path": "extraction-order/extraction-order",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "取货订单"
-					}
-				},
-				{
-					"path": "extraction-switch/extraction-switch",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "取货点切换"
-					}
-				},
-				{
-					"path": "introduce/introduce",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "等级介绍"
-					}
-				}
-			]
-		},
-		{
-			"root": "pages/plugins/wallet",
-			"pages": [{
-					"path": "user/user",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "我的钱包"
-					}
-				},
-				{
-					"path": "recharge/recharge",
-					"style": {
-						"enablePullDownRefresh": false,
-						"navigationBarTitleText": "充值"
-					}
-				},
-				{
-					"path": "cash-auth/cash-auth",
-					"style": {
-						"enablePullDownRefresh": false,
-						"navigationBarTitleText": "余额提现"
-					}
-				},
-				{
-					"path": "cash-create/cash-create",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "余额提现"
-					}
-				},
-				{
-					"path": "wallet-log/wallet-log",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "账户明细"
-					}
-				},
-				{
-					"path": "wallet-log-detail/wallet-log-detail",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "明细详情"
-					}
-				},
-				{
-					"path": "user-recharge/user-recharge",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "充值记录"
-					}
-				},
-				{
-					"path": "user-recharge-detail/user-recharge-detail",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "充值详情"
-					}
-				},
-				{
-					"path": "user-cash/user-cash",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "提现记录"
-					}
-				},
-				{
-					"path": "user-cash-detail/user-cash-detail",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "提现详情"
-					}
-				},
-				{
-					"path": "payment-code/payment-code",
-					"style": {
-						"enablePullDownRefresh": false,
-						"navigationBarTitleText": "钱包付款码"
-					}
-				}
-			]
-		},
-		{
-			"root": "pages/plugins/excellentbuyreturntocash",
-			"pages": [{
-					"path": "profit/profit",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "优购返现明细"
-					}
-				},
-				{
-					"path": "profit-detail/profit-detail",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "优购返现详情"
-					}
-				}
-			]
-		},
-		{
-			"root": "pages/plugins/weixinliveplayer",
-			"pages": [{
-					"path": "index/index",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "直播"
-					}
-				},
-				{
-					"path": "search/search",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "直播列表"
-					}
-				},
-				{
-					"path": "detail/detail",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "直播详情"
-					}
-				}
-			]
-		},
-		{
-			"root": "pages/plugins/exchangerate",
-			"pages": [{
-				"path": "currency/currency",
-				"style": {
-					"enablePullDownRefresh": true,
-					"navigationBarTitleText": "货币切换"
-				}
-			}]
-		},
-		{
-			"root": "pages/plugins/invoice",
-			"pages": [{
-					"path": "user/user",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "我的发票"
-					}
-				},
-				{
-					"path": "invoice/invoice",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "开票列表"
-					}
-				},
-				{
-					"path": "invoice-detail/invoice-detail",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "发票详情"
-					}
-				},
-				{
-					"path": "invoice-saveinfo/invoice-saveinfo",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "开票编辑"
-					}
-				},
-				{
-					"path": "order/order",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "订单开票"
-					}
-				}
-			]
-		},
-		{
-			"root": "pages/plugins/signin",
-			"pages": [{
-					"path": "user/user",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "签到"
-					}
-				},
-				{
-					"path": "index-detail/index-detail",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "签到"
-					}
-				},
-				{
-					"path": "user-signin/user-signin",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "我的签到"
-					}
-				},
-				{
-					"path": "user-qrcode/user-qrcode",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "签到码管理"
-					}
-				},
-				{
-					"path": "user-qrcode-detail/user-qrcode-detail",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "签到码详情"
-					}
-				},
-				{
-					"path": "user-qrcode-saveinfo/user-qrcode-saveinfo",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "签到码编辑"
-					}
-				},
-				{
-					"path": "user-coming-list/user-coming-list",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "用户签到"
-					}
-				}
-			]
-		},
-		{
-			"root": "pages/plugins/points",
-			"pages": [{
-				"path": "index/index",
-				"style": {
-					"enablePullDownRefresh": true,
-					"navigationBarTitleText": "积分商城"
-				}
-			}]
-		},
-		{
-			"root": "pages/plugins/brand",
-			"pages": [{
-				"path": "index/index",
-				"style": {
-					"enablePullDownRefresh": true,
-					"navigationBarTitleText": "品牌"
-				}
-			}]
-		},
-		{
-			"root": "pages/plugins/shop",
-			"pages": [{
-					"path": "index/index",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "所有店铺"
-					}
-				},
-				{
-					"path": "detail/detail",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "店铺首页"
-					}
-				},
-				{
-					"path": "search/search",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "店铺商品搜索"
-					}
-				},
-				{
-					"path": "design/design",
-					"style": {
-						"enablePullDownRefresh": true
-					}
-				},
-				{
-					"path": "favor/favor",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "店铺收藏"
-					}
-				},
-				{
-					"path": "license/license",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "工商资质"
-					}
-				}
-			]
-		},
-		{
-			"root": "pages/plugins/activity",
-			"pages": [{
-					"path": "index/index",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "所有活动"
-					}
-				},
-				{
-					"path": "detail/detail",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "活动详情"
-					}
-				}
-			]
-		},
-		{
-			"root": "pages/plugins/label",
-			"pages": [{
-				"path": "detail/detail",
-				"style": {
-					"enablePullDownRefresh": true,
-					"navigationBarTitleText": "标签详情"
-				}
-			}]
-		},
-		{
-			"root": "pages/plugins/blog",
-			"pages": [{
-					"path": "index/index",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "博客"
-					}
-				},
-				{
-					"path": "search/search",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "博文搜索"
-					}
-				},
-				{
-					"path": "detail/detail",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "博文详情"
-					}
-				},
-				{
-					"path": "comments/comments",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "评论列表"
-					}
-				}
-			]
-		},
-		{
-			"root": "pages/plugins/express",
-			"pages": [{
-				"path": "detail/detail",
-				"style": {
-					"enablePullDownRefresh": true,
-					"navigationBarTitleText": "物流详情"
-				}
-			}]
-		},
-		{
-			"root": "pages/plugins/realstore",
-			"pages": [{
-					"path": "index/index",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "门店"
-					}
-				},
-				{
-					"path": "search/search",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "门店搜索"
-					}
-				},
-				{
-					"path": "detail/detail",
-					"style": {
-						// #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU
-						"navigationStyle": "custom",
-						// #endif
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "门店详情"
-					}
-				},
-				{
-					"path": "favor/favor",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "门店收藏"
-					}
-				},
-				{
-					"path": "orderallot-list/orderallot-list",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "子订单列表"
-					}
-				},
-				{
-					"path": "orderallot-detail/orderallot-detail",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "子订单详情"
-					}
-				},
-				{
-					"path": "batchorder-list/batchorder-list",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "批次订单"
-					}
-				},
-				{
-					"path": "frequencycard-list/frequencycard-list",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "次卡"
-					}
-				},
-				{
-					"path": "frequencycard-used/frequencycard-used",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "次卡使用记录"
-					}
-				}
-			]
-		},
-		{
-			"root": "pages/plugins/binding",
-			"pages": [{
-					"path": "index/index",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "组合搭配"
-					}
-				},
-				{
-					"path": "detail/detail",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "组合搭配详情"
-					}
-				}
-			]
-		},
-		{
-			"root": "pages/plugins/delivery",
-			"pages": [{
-					"path": "order/order",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "配送订单"
-					}
-				},
-				{
-					"path": "order-detail/order-detail",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "订单详情"
-					}
-				}
-			]
-		}
-	],
-	"globalStyle": {
-		"navigationBarTitleText": "ShopXO",
-		"navigationBarTextStyle": "black",
-		"navigationBarBackgroundColor": "#fff",
-		"backgroundColor": "#f5f5f5",
-		"backgroundColorBottom": "#f5f5f5"
-	},
-	"tabBar": {
-		"color": "#8a8a8a",
-		"selectedColor": "#f6c133",
-		"backgroundColor": "#fff",
-		"list": [{
-				"pagePath": "pages/index/index",
-				"iconPath": "static/images/common/tabbar/home.png",
-				"selectedIconPath": "static/images/yellow/tabbar/home.png",
-				"text": "首页"
-			},
-			{
-				"pagePath": "pages/goods-category/goods-category",
-				"iconPath": "static/images/common/tabbar/category.png",
-				"selectedIconPath": "static/images/yellow/tabbar/category.png",
-				"text": "分类"
-			},
-			{
-				"pagePath": "pages/cart/cart",
-				"iconPath": "static/images/common/tabbar/cart.png",
-				"selectedIconPath": "static/images/yellow/tabbar/cart.png",
-				"text": "购物车"
-			},
-			{
-				"pagePath": "pages/user/user",
-				"iconPath": "static/images/common/tabbar/user.png",
-				"selectedIconPath": "static/images/yellow/tabbar/user.png",
-				"text": "我的"
-			}
-		]
-	}
+{
+	"pages": [
+		{
+			"path": "pages/index/index",
+			"style": {
+                // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || H5 || APP
+                "navigationStyle": "custom",
+                // #endif
+                // #ifndef MP-ALIPAY
+                "navigationBarTitleText": "ShopXO",
+                // #endif
+                // #ifdef MP-ALIPAY
+                "transparentTitle": "always",
+                "titlePenetrate": "YES",
+                "navigationBarTitleText": "",
+                // #endif
+				"enablePullDownRefresh": true,
+                "navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/goods-category/goods-category",
+			"style": {
+                // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || H5 || APP
+                "navigationStyle": "custom",
+                // #endif
+                // #ifndef MP-ALIPAY
+                "navigationBarTitleText": "商品分类",
+                // #endif
+                // #ifdef MP-ALIPAY
+                "transparentTitle": "always",
+                "titlePenetrate": "YES",
+                "navigationBarTitleText": "",
+                // #endif
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/cart/cart",
+			"style": {
+				"enablePullDownRefresh": true,
+                "navigationBarTitleText": "购物车"
+			}
+		},
+		{
+			"path": "pages/user/user",
+			"style": {
+                // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || H5 || APP
+                "navigationStyle": "custom",
+                // #endif
+                // #ifndef MP-ALIPAY
+                "navigationBarTitleText": "用户中心",
+                // #endif
+                // #ifdef MP-ALIPAY
+                "transparentTitle": "always",
+                "titlePenetrate": "YES",
+                "navigationBarTitleText": "",
+                // #endif
+				"enablePullDownRefresh": true
+			}
+		},
+        {
+        	"path": "pages/cart-page/cart-page",
+        	"style": {
+        		"enablePullDownRefresh": true,
+                "navigationBarTitleText": "购物车"
+        	}
+        },
+		{
+			"path": "pages/buy/buy",
+			"style": {
+				"enablePullDownRefresh": true,
+                "navigationBarTitleText": "订单确认"
+			}
+		},
+		{
+			"path": "pages/web-view/web-view",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/login/login",
+			"style": {
+				"enablePullDownRefresh": false,
+                "navigationBarTitleText": "登录"
+			}
+		},
+		{
+			"path": "pages/paytips/paytips",
+			"style": {
+				"enablePullDownRefresh": false,
+                "navigationBarTitleText": "安全支付"
+			}
+		},
+		{
+			"path": "pages/goods-search/goods-search",
+			"style": {
+				"enablePullDownRefresh": true,
+                "navigationBarTitleText": "商品搜索"
+			}
+		},
+		{
+			"path": "pages/goods-detail/goods-detail",
+			"style": {
+                // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU
+                "navigationStyle": "custom",
+                // #endif
+                "enablePullDownRefresh": true,
+                "navigationBarTitleText": "商品详情"
+            }
+		},
+		{
+			"path": "pages/goods-comment/goods-comment",
+			"style": {
+				"enablePullDownRefresh": true,
+                "navigationBarTitleText": "商品评价"
+			}
+		},
+		{
+			"path": "pages/user-address/user-address",
+			"style": {
+				"enablePullDownRefresh": true,
+                "navigationBarTitleText": "我的地址"
+			}
+		},
+		{
+			"path": "pages/user-address-save/user-address-save",
+			"style": {
+				"enablePullDownRefresh": false,
+                "navigationBarTitleText": "地址编辑"
+			}
+		},
+		{
+			"path": "pages/user-order/user-order",
+			"style": {
+				"enablePullDownRefresh": true,
+                "navigationBarTitleText": "我的订单"
+			}
+		},
+		{
+			"path": "pages/user-order-detail/user-order-detail",
+			"style": {
+				"enablePullDownRefresh": true,
+                "navigationBarTitleText": "订单详情"
+			}
+		},
+		{
+			"path": "pages/user-order-comments/user-order-comments",
+			"style": {
+				"enablePullDownRefresh": true,
+                "navigationBarTitleText": "订单评价"
+			}
+		},
+		{
+			"path": "pages/user-favor/user-favor",
+			"style": {
+				"enablePullDownRefresh": true,
+                "navigationBarTitleText": "商品收藏"
+			}
+		},
+		{
+			"path": "pages/user-answer-list/user-answer-list",
+			"style": {
+				"enablePullDownRefresh": true,
+                "navigationBarTitleText": "我的留言"
+			}
+		},
+		{
+			"path": "pages/answer-list/answer-list",
+			"style": {
+				"enablePullDownRefresh": true,
+                "navigationBarTitleText": "问答广场"
+			}
+		},
+		{
+			"path": "pages/answer-form/answer-form",
+			"style": {
+				"enablePullDownRefresh": false,
+                "navigationBarTitleText": "留言"
+			}
+		},
+		{
+			"path": "pages/message/message",
+			"style": {
+				"enablePullDownRefresh": true,
+                "navigationBarTitleText": "消息"
+			}
+		},
+		{
+			"path": "pages/user-integral/user-integral",
+			"style": {
+				"enablePullDownRefresh": true,
+                "navigationBarTitleText": "积分明细"
+			}
+		},
+		{
+			"path": "pages/user-goods-browse/user-goods-browse",
+			"style": {
+				"enablePullDownRefresh": true,
+                "navigationBarTitleText": "我的足迹"
+			}
+		},
+		{
+			"path": "pages/user-orderaftersale/user-orderaftersale",
+			"style": {
+				"enablePullDownRefresh": true,
+                "navigationBarTitleText": "退款/售后"
+			}
+		},
+		{
+			"path": "pages/user-orderaftersale-detail/user-orderaftersale-detail",
+			"style": {
+				"enablePullDownRefresh": true,
+                "navigationBarTitleText": "订单售后"
+                
+			}
+		},
+		{
+			"path": "pages/extraction-address/extraction-address",
+			"style": {
+				"enablePullDownRefresh": true,
+                "navigationBarTitleText": "自提地址"
+			}
+		},
+		{
+			"path": "pages/common/open-setting-location/open-setting-location",
+			"style": {
+                // #ifndef MP-TOUTIAO
+                "navigationStyle": "custom",
+                // #endif
+				"enablePullDownRefresh": false
+			}
+		},
+        {
+        	"path": "pages/common/agreement/agreement",
+        	"style": {
+                // #ifndef MP-TOUTIAO
+                "navigationStyle": "custom",
+                // #endif
+        		"enablePullDownRefresh": false
+        	}
+        },
+		{
+			"path": "pages/design/design",
+			"style": {
+				"enablePullDownRefresh": true,
+				"navigationBarTitleText": "页面设计"
+			}
+		},
+        {
+        	"path": "pages/error/error",
+        	"style": {
+        		"enablePullDownRefresh": true,
+        		"navigationBarTitleText": "温馨提示"
+        	}
+        },
+        {
+            "path": "pages/article-category/article-category",
+            "style": {
+            	"enablePullDownRefresh": true,
+            	"navigationBarTitleText": "所有文章"
+            }
+        },
+        {
+            "path": "pages/article-detail/article-detail",
+            "style": {
+            	"enablePullDownRefresh": true,
+            	"navigationBarTitleText": "文章详情"
+            }
+        },
+        {
+            "path": "pages/setup/setup",
+            "style": {
+            	"enablePullDownRefresh": false,
+            	"navigationBarTitleText": "设置"
+            }
+        },
+        {
+            "path": "pages/personal/personal",
+            "style": {
+            	"enablePullDownRefresh": false,
+            	"navigationBarTitleText": "个人资料"
+            }
+        },
+        {
+            "path": "pages/logout/logout",
+            "style": {
+            	"enablePullDownRefresh": false,
+            	"navigationBarTitleText": "账号注销"
+            }
+        }
+	],
+    "subPackages": [
+        {
+            "root": "pages/plugins/seckill",
+            "pages": [
+                {
+                    "path": "index/index",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": "限时秒杀"
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/plugins/coupon",
+            "pages": [
+                {
+                	"path": "index/index",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "领券中心"
+                	}
+                },
+                {
+                	"path": "shop/shop",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "店铺领券中心"
+                	}
+                },
+                {
+                	"path": "user/user",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "我的卡券"
+                	}
+                }
+            ]
+        },
+        {
+            "root": "pages/plugins/membershiplevelvip",
+            "pages": [
+                {
+                	"path": "index/index",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "会员VIP"
+                	}
+                },
+                {
+                	"path": "buy/buy",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "开通会员"
+                	}
+                },
+                {
+                	"path": "user/user",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "我的会员"
+                	}
+                },
+                {
+                	"path": "order/order",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "开通订单"
+                	}
+                },
+                {
+                	"path": "order-detail/order-detail",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "订单详情"
+                	}
+                },
+                {
+                	"path": "profit/profit",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "收益明细"
+                	}
+                },
+                {
+                	"path": "profit-detail/profit-detail",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "收益详情"
+                	}
+                },
+                {
+                	"path": "statistics/statistics",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "数据统计"
+                	}
+                },
+                {
+                	"path": "poster/poster",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "推广返利"
+                	}
+                },
+                {
+                	"path": "team/team",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "我的团队"
+                	}
+                },
+                {
+                	"path": "member-code/member-code",
+                	"style": {
+                		"enablePullDownRefresh": false,
+                		"navigationBarTitleText": "会员码"
+                	}
+                }
+            ]
+        },
+        {
+            "root": "pages/plugins/distribution",
+            "pages": [
+                {
+                	"path": "user/user",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "我的分销"
+                	}
+                },
+                {
+                	"path": "order/order",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "分销订单"
+                	}
+                },
+                {
+                	"path": "order-detail/order-detail",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "订单详情"
+                	}
+                },
+                {
+                	"path": "profit/profit",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "收益明细"
+                	}
+                },
+                {
+                	"path": "profit-detail/profit-detail",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "收益详情"
+                	}
+                },
+                {
+                	"path": "team/team",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "我的团队"
+                	}
+                },
+                {
+                	"path": "map/map",
+                	"style": {
+                		"enablePullDownRefresh": false,
+                		"navigationBarTitleText": "客户分布"
+                	}
+                },
+                {
+                	"path": "recommend-list/recommend-list",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "我的推荐宝"
+                	}
+                },
+                {
+                	"path": "recommend-detail/recommend-detail",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "推荐宝详情"
+                	}
+                },
+                {
+                	"path": "recommend-form/recommend-form",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "推荐宝添加/编辑"
+                	}
+                },
+                {
+                	"path": "poster/poster",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "推广返利"
+                	}
+                },
+                {
+                	"path": "extraction/extraction",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "取货点"
+                	}
+                },
+                {
+                	"path": "extraction-apply/extraction-apply",
+                	"style": {
+                		"enablePullDownRefresh": false,
+                		"navigationBarTitleText": "取货点信息"
+                	}
+                },
+                {
+                	"path": "extraction-order/extraction-order",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "取货订单"
+                	}
+                },
+                {
+                	"path": "extraction-switch/extraction-switch",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                        "navigationBarTitleText": "取货点切换"
+                	}
+                },
+                {
+                	"path": "introduce/introduce",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "等级介绍"
+                	}
+                }
+            ]
+        },
+        {
+            "root": "pages/plugins/wallet",
+            "pages": [
+                {
+                	"path": "user/user",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "我的钱包"
+                	}
+                },
+                {
+                	"path": "recharge/recharge",
+                	"style": {
+                		"enablePullDownRefresh": false,
+                		"navigationBarTitleText": "充值"
+                	}
+                },
+                {
+                	"path": "cash-auth/cash-auth",
+                	"style": {
+                		"enablePullDownRefresh": false,
+                		"navigationBarTitleText": "余额提现"
+                	}
+                },
+                {
+                	"path": "cash-create/cash-create",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "余额提现"
+                	}
+                },
+                {
+                	"path": "wallet-log/wallet-log",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "账户明细"
+                	}
+                },
+                {
+                	"path": "wallet-log-detail/wallet-log-detail",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "明细详情"
+                	}
+                },
+                {
+                	"path": "user-recharge/user-recharge",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "充值记录"
+                	}
+                },
+                {
+                	"path": "user-recharge-detail/user-recharge-detail",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "充值详情"
+                	}
+                },
+                {
+                	"path": "user-cash/user-cash",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "提现记录"
+                	}
+                },
+                {
+                	"path": "user-cash-detail/user-cash-detail",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "提现详情"
+                	}
+                },
+                {
+                	"path": "payment-code/payment-code",
+                	"style": {
+                		"enablePullDownRefresh": false,
+                		"navigationBarTitleText": "钱包付款码"
+                	}
+                }
+            ]
+        },
+        {
+            "root": "pages/plugins/excellentbuyreturntocash",
+            "pages": [
+                {
+                	"path": "profit/profit",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "优购返现明细"
+                	}
+                },
+                {
+                	"path": "profit-detail/profit-detail",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "优购返现详情"
+                	}
+                }
+            ]
+        },
+        {
+            "root": "pages/plugins/weixinliveplayer",
+            "pages": [
+                {
+                	"path": "index/index",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "直播"
+                	}
+                },
+                {
+                	"path": "search/search",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "直播列表"
+                	}
+                },
+                {
+                	"path": "detail/detail",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "直播详情"
+                	}
+                }
+            ]
+        },
+        {
+            "root": "pages/plugins/exchangerate",
+            "pages": [
+                {
+                	"path": "currency/currency",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "货币切换"
+                	}
+                }
+            ]
+        },
+        {
+            "root": "pages/plugins/invoice",
+            "pages": [
+                {
+                	"path": "user/user",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "我的发票"
+                	}
+                },
+                {
+                	"path": "invoice/invoice",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "开票列表"
+                	}
+                },
+                {
+                	"path": "invoice-detail/invoice-detail",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "发票详情"
+                	}
+                },
+                {
+                	"path": "invoice-saveinfo/invoice-saveinfo",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "开票编辑"
+                	}
+                },
+                {
+                	"path": "order/order",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "订单开票"
+                	}
+                }
+            ]
+        },
+        {
+            "root": "pages/plugins/signin",
+            "pages": [
+                {
+                	"path": "user/user",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "签到"
+                	}
+                },
+                {
+                	"path": "index-detail/index-detail",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "签到"
+                	}
+                },
+                {
+                	"path": "user-signin/user-signin",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "我的签到"
+                	}
+                },
+                {
+                	"path": "user-qrcode/user-qrcode",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "签到码管理"
+                	}
+                },
+                {
+                	"path": "user-qrcode-detail/user-qrcode-detail",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "签到码详情"
+                	}
+                },
+                {
+                	"path": "user-qrcode-saveinfo/user-qrcode-saveinfo",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "签到码编辑"
+                	}
+                },
+                {
+                	"path": "user-coming-list/user-coming-list",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "用户签到"
+                	}
+                }
+            ]
+        },
+        {
+            "root": "pages/plugins/points",
+            "pages": [
+                {
+                	"path": "index/index",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "积分商城"
+                	}
+                }
+            ]
+        },
+        {
+            "root": "pages/plugins/brand",
+            "pages": [
+                {
+                	"path": "index/index",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "品牌"
+                	}
+                }
+            ]
+        },
+        {
+            "root": "pages/plugins/shop",
+            "pages": [
+                {
+                	"path": "index/index",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "所有店铺"
+                	}
+                },
+                {
+                	"path": "detail/detail",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                        "navigationBarTitleText": "店铺首页"
+                	}
+                },
+                {
+                	"path": "search/search",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "店铺商品搜索"
+                	}
+                },
+                {
+                	"path": "design/design",
+                	"style": {
+                		"enablePullDownRefresh": true
+                	}
+                },
+                {
+                	"path": "favor/favor",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "店铺收藏"
+                	}
+                },
+                {
+                	"path": "license/license",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "工商资质"
+                	}
+                }
+            ]
+        },
+        {
+            "root": "pages/plugins/activity",
+            "pages": [
+                {
+                	"path": "index/index",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "所有活动"
+                	}
+                },
+                {
+                	"path": "detail/detail",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "活动详情"
+                	}
+                }
+            ]
+        },
+        {
+            "root": "pages/plugins/label",
+            "pages": [
+                {
+                	"path": "detail/detail",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "标签详情"
+                	}
+                }
+            ]
+        },
+        {
+            "root": "pages/plugins/blog",
+            "pages": [
+                {
+                	"path": "index/index",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "博客"
+                	}
+                },
+                {
+                	"path": "search/search",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "博文搜索"
+                	}
+                },
+                {
+                	"path": "detail/detail",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "博文详情"
+                	}
+                },
+                {
+                	"path": "comments/comments",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "评论列表"
+                	}
+                }
+            ]
+        },
+        {
+            "root": "pages/plugins/express",
+            "pages": [
+                {
+                	"path": "detail/detail",
+                	"style": {
+                		"enablePullDownRefresh": true,
+                		"navigationBarTitleText": "物流详情"
+                	}
+                }
+            ]
+        },
+        {
+            "root": "pages/plugins/realstore",
+            "pages": [
+                {
+                    "path": "index/index",
+                    "style": {
+                    	"enablePullDownRefresh": true,
+                    	"navigationBarTitleText": "门店"
+                    }
+                },
+                {
+                    "path": "search/search",
+                    "style": {
+                    	"enablePullDownRefresh": true,
+                    	"navigationBarTitleText": "门店搜索"
+                    }
+                },
+                {
+                	"path": "detail/detail",
+                	"style": {
+                        // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU
+                        "navigationStyle": "custom",
+                        // #endif
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": "门店详情"
+                    }
+                },
+                {
+                    "path": "favor/favor",
+                    "style": {
+                    	"enablePullDownRefresh": true,
+                    	"navigationBarTitleText": "门店收藏"
+                    }
+                },
+                {
+                    "path": "orderallot-list/orderallot-list",
+                    "style": {
+                    	"enablePullDownRefresh": true,
+                    	"navigationBarTitleText": "子订单列表"
+                    }
+                },
+                {
+                    "path": "orderallot-detail/orderallot-detail",
+                    "style": {
+                    	"enablePullDownRefresh": true,
+                    	"navigationBarTitleText": "子订单详情"
+                    }
+                },
+                {
+                    "path": "batchorder-list/batchorder-list",
+                    "style": {
+                    	"enablePullDownRefresh": true,
+                    	"navigationBarTitleText": "批次订单"
+                    }
+                },
+                {
+                    "path": "frequencycard-list/frequencycard-list",
+                    "style": {
+                    	"enablePullDownRefresh": true,
+                    	"navigationBarTitleText": "次卡"
+                    }
+                },
+                {
+                    "path": "frequencycard-used/frequencycard-used",
+                    "style": {
+                    	"enablePullDownRefresh": true,
+                    	"navigationBarTitleText": "次卡使用记录"
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/plugins/binding",
+            "pages": [
+                {
+                    "path": "index/index",
+                    "style": {
+                    	"enablePullDownRefresh": true,
+                    	"navigationBarTitleText": "组合搭配"
+                    }
+                },
+                {
+                    "path": "detail/detail",
+                    "style": {
+                    	"enablePullDownRefresh": true,
+                    	"navigationBarTitleText": "组合搭配详情"
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/plugins/delivery",
+            "pages": [
+                {
+                    "path": "order/order",
+                    "style": {
+                    	"enablePullDownRefresh": true,
+                    	"navigationBarTitleText": "配送订单"
+                    }
+                },
+                {
+                    "path": "order-detail/order-detail",
+                    "style": {
+                    	"enablePullDownRefresh": true,
+                    	"navigationBarTitleText": "订单详情"
+                    }
+                }
+            ]
+        }
+    ],
+	"globalStyle": {
+		"navigationBarTitleText": "ShopXO",
+        "navigationBarTextStyle": "black",
+		"navigationBarBackgroundColor": "#fff",
+		"backgroundColor": "#f5f5f5",
+		"backgroundColorBottom": "#f5f5f5"
+	},
+    "tabBar": {
+    	"color": "#8a8a8a",
+    	"selectedColor": "#f6c133",
+    	"backgroundColor": "#fff",
+    	"list": [
+    		{
+    			"pagePath": "pages/index/index",
+    			"iconPath": "static/images/common/tabbar/home.png",
+    			"selectedIconPath": "static/images/yellow/tabbar/home.png",
+    			"text": "首页"
+    		},
+    		{
+    			"pagePath": "pages/goods-category/goods-category",
+    			"iconPath": "static/images/common/tabbar/category.png",
+    			"selectedIconPath": "static/images/yellow/tabbar/category.png",
+    			"text": "分类"
+    		},
+    		{
+    			"pagePath": "pages/cart/cart",
+    			"iconPath": "static/images/common/tabbar/cart.png",
+    			"selectedIconPath": "static/images/yellow/tabbar/cart.png",
+    			"text": "购物车"
+    		},
+    		{
+    			"pagePath": "pages/user/user",
+    			"iconPath": "static/images/common/tabbar/user.png",
+    			"selectedIconPath": "static/images/yellow/tabbar/user.png",
+    			"text": "我的"
+    		}
+    	]
+    }
 }
\ No newline at end of file
diff --git a/pages/common/agreement/agreement.vue b/pages/common/agreement/agreement.vue
new file mode 100644
index 00000000..5b87d9e1
--- /dev/null
+++ b/pages/common/agreement/agreement.vue
@@ -0,0 +1,113 @@
+<template>
+    <view class="agreement-page bs-bb">
+        <view class="agreement-content border-radius-main bg-white" v-if="is_show_privacy">
+            <view class="tc">
+                <image class="logo circle auto dis-block margin-bottom-lg br" :src="logo" mode="widthFix"></image>
+                <view class="cr-base fw-b text-size-lg">{{title}}温馨提示</view>
+            </view>
+            <view class="margin-top-lg text-size-sm cr-base content-desc">
+                <block v-if="(content || null) == null">
+                    尊敬的用户、为了向您提供更优质的服务，在您使用{{title}}小程序前，您需要通过点击【同意】并阅读以下协议内容以表示您充分知悉、理解并同意本温馨提示的相关协议的各项规则，包括我们会在您开启的位置信息提供更契合您需求的页面展示、产品或服务，比如首页向您推荐商品或相关门店及排行榜信息。
+                </block>
+                <block v-else>{{content}}</block>
+            </view>
+            <view class="cr-blue margin-top-lg">
+                <view>
+                    <text @tap="agreement_event" data-value="userregister">《{{title}}服务用户协议》</text>
+                </view>
+                <view class="margin-top-sm">
+                    <text @tap="agreement_event" data-value="userprivacy">《{{title}}隐私权政策》</text>
+                </view>
+            </view>
+            <view class="buttom tc margin-top-xxxl padding-top-lg">
+                <button type="default" size="mini" class="br-base cr-base bg-white text-size-sm round margin-right-xxxl" @tap="exit_event">不同意</button>
+                <button type="default" size="mini" class="br-main cr-white bg-main text-size-sm round margin-left-xxxl" open-type="agreePrivacyAuthorization" @agreeprivacyauthorization="agree_privacy_auth_event">同意</button>
+            </view>
+        </view>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    export default {
+        data() {
+            return {
+                logo: app.globalData.get_application_logo_square(),
+                title: app.globalData.get_application_title(),
+                is_show_privacy: false,
+                content: null
+            }
+        },
+
+        // 页面加载初始化
+        onLoad() {
+            uni.getPrivacySetting({
+                success: res => {
+                    if (res.needAuthorization) {
+                        this.setData({
+                            is_show_privacy: true,
+                            content: app.globalData.get_config('config.common_app_mini_weixin_privacy_content', null),
+                        });
+                    } else {
+                        uni.navigateBack();
+                    }
+                },
+                fail: () => {
+                    uni.navigateBack();
+                }
+            });
+        },
+
+        methods: {
+            // 协议事件
+            agreement_event(e) {
+                var value = e.currentTarget.dataset.value || null;
+                if (value == null) {
+                    app.globalData.showToast('协议类型有误');
+                    return false;
+                }
+
+                // 是否存在协议 url 地址
+                var key = 'agreement_' + value + '_url';
+                var url = app.globalData.get_config('config.' + key) || null;
+                if (url == null) {
+                    app.globalData.showToast('协议url地址有误');
+                    return false;
+                }
+
+                // 打开 webview
+                app.globalData.open_web_view(url);
+            },
+
+            // 退出小程序
+            exit_event(e) {
+                uni.exitMiniProgram();
+            },
+
+            // 授权回调
+            agree_privacy_auth_event() {
+                uni.navigateBack();
+            }
+        }
+    }
+</script>
+<style>
+    .agreement-page {
+        background-color: rgba(0, 0, 0, 0.6);
+        height: 100vh;
+        padding: 40rpx;
+    }
+    .agreement-content {
+        margin-top: 30%;
+        padding: 40rpx;
+    }
+    .agreement-content .logo {
+        width: 160rpx;
+        height: 160rpx;
+    }
+    .agreement-content .content-desc {
+        line-height: 46rpx;
+    }
+    .agreement-content .buttom button {
+        min-width: 200rpx;
+    }
+</style>
\ No newline at end of file
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 4bd521d8..30e2f522 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -113,7 +113,7 @@
                                 </radio-group>
                             </view>
                             <view class="dis-inline-block va-m">
-                                阅读并同意 《<text class="cr-main" @tap="agreement_event" data-value="userregister">服务协议</text>》 与 《<text class="cr-main" @tap="agreement_event" data-value="userprivacy">隐私政策</text>》
+                                阅读并同意 《<text class="cr-main" @tap="agreement_event" data-value="userregister">服务协议</text>》 与 《<text class="cr-main" @tap="agreement_event" data-value="userprivacy">隐私权政策</text>》
                             </view>
                         </view>
                         <button class="bg-main br-main cr-white round text-size margin-top-xxxl" form-type="submit" type="default" hover-class="none" :loading="form_submit_loading" :disabled="form_submit_loading">确认登录</button>
@@ -192,7 +192,7 @@
                                 </radio-group>
                             </view>
                             <view class="dis-inline-block va-m">
-                                阅读并同意 《<text class="cr-main" @tap="agreement_event" data-value="userregister">服务协议</text>》 与 《<text class="cr-main" @tap="agreement_event" data-value="userprivacy">隐私政策</text>》
+                                阅读并同意 《<text class="cr-main" @tap="agreement_event" data-value="userregister">服务协议</text>》 与 《<text class="cr-main" @tap="agreement_event" data-value="userprivacy">隐私权政策</text>》
                             </view>
                         </view>
                         <button class="bg-main br-main cr-white round text-size margin-top-xxxl" form-type="submit" type="default" hover-class="none" :loading="form_submit_loading" :disabled="form_submit_loading">确认注册</button>
@@ -262,7 +262,7 @@
                             </radio-group>
                         </view>
                         <view class="dis-inline-block va-m">
-                            阅读并同意 《<text class="cr-main" @tap="agreement_event" data-value="userregister">服务协议</text>》 与 《<text class="cr-main" @tap="agreement_event" data-value="userprivacy">隐私政策</text>》
+                            阅读并同意 《<text class="cr-main" @tap="agreement_event" data-value="userregister">服务协议</text>》 与 《<text class="cr-main" @tap="agreement_event" data-value="userprivacy">隐私权政策</text>》
                         </view>
                     </view>
                     <view class="margin-top-xxl">
diff --git a/pages/plugins/seckill/index/index.css b/pages/plugins/seckill/index/index.css
new file mode 100644
index 00000000..a5bdcb1b
--- /dev/null
+++ b/pages/plugins/seckill/index/index.css
@@ -0,0 +1,22 @@
+/**
+ * 秒杀导航
+ */
+.nav_seckill .item {
+	width: 176rpx;
+	padding: 26rpx 0;
+}
+
+.nav_seckill .item .time {
+	line-height: 50rpx;
+}
+
+.nav_seckill .item .state {
+	margin-top: 4rpx;
+	padding: 0 14rpx;
+	display: inline-flex;
+}
+
+.nav_seckill .item .state.active {
+	font-size: 22rpx;
+	background-color: #fff;
+}
\ No newline at end of file
diff --git a/pages/plugins/seckill/index/index.vue b/pages/plugins/seckill/index/index.vue
index 6f8fdda9..5f9faf9d 100644
--- a/pages/plugins/seckill/index/index.vue
+++ b/pages/plugins/seckill/index/index.vue
@@ -1,176 +1,198 @@
 <template>
-    <view>
-        <view v-if="(data_base || null) != null" :style="seckill_bg">
-            <view class="padding-horizontal-main padding-top-main">
-                <!-- 公告信息 -->
-                <view v-if="(data_base.content_notice || null) != null && data_base.content_notice.length > 0" class="spacing-mb">
-                    <view class="notice-content">
-                        <view v-for="(item, index) in data_base.content_notice" :key="index" class="item">{{item}}</view>
-                    </view>
-                </view>
+	<view>
+		<view v-if="(data_base || null) != null" :style="seckill_bg">
+			<!-- 秒杀时段 -->
+			<scroll-view :scroll-x="true" :scroll-with-animation="true" :scroll-into-view="'one-nav-item-'+nav_active_index" class="top-nav-scroll">
+				<view class="nav_seckill flex-row flex-nowrap bg-main cr-white">
+					<view v-for="(item, index) in periods_list" :key="index" class="item tc cp text-size-xss" :id="'one-nav-item-'+index" :data-index="index" @tap="nav_event">
+						<view class="time text-size-lg">{{item.name}}</view>
+						<view class="state text-size-xs round" :class="item.time.status === 1 ? 'active cr-main' : ''">{{item.time.msg}}</view>
+					</view>
+				</view>
+			</scroll-view>
+			<view class="padding-horizontal-main padding-top-main">
+				<!-- 公告信息 -->
+				<view v-if="(data_base.content_notice || null) != null && data_base.content_notice.length > 0" class="spacing-mb">
+					<view class="notice-content">
+						<view v-for="(item, index) in data_base.content_notice" :key="index" class="item">{{item}}</view>
+					</view>
+				</view>
 
-                <!-- 基础信息、倒计时 -->
-                <view class="oh spacing-mb">
-                    <text :class="'va-m '+(is_valid == 1 ? 'cr-base' : 'cr-red')">{{time.msg}}</text>
-                    <view v-if="is_valid == 1" class="dis-inline-block va-m margin-left-sm">
-                        <component-countdown :propHour="time.hours" :propMinute="time.minutes" :propSecond="time.seconds"></component-countdown>
-                    </view>
-                </view>
+				<!-- 基础信息、倒计时 -->
+				<view class="oh spacing-mb">
+					<text :class="'va-m '+(is_valid == 1 ? 'cr-base' : 'cr-red')">{{time.msg}}</text>
+					<view v-if="is_valid == 1" class="dis-inline-block va-m margin-left-sm">
+						<component-countdown :propHour="time.hours" :propMinute="time.minutes" :propSecond="time.seconds"></component-countdown>
+					</view>
+				</view>
 
-                <!-- 商品 -->
-                <view v-if="goods.length > 0">
-                    <component-goods-list :propData="{style_type: 1, goods_list: goods}" :propCurrencySymbol="currency_symbol" :propIsShowPriceIcon="true" propPriceField="seckill_min_price"></component-goods-list>
-                </view>
-                <view v-else>
-                    <!-- 提示信息 -->
-                    <component-no-data propStatus="0" propMsg="没有相关商品"></component-no-data>
-                </view>
-            </view>
+				<!-- 商品 -->
+				<view v-if="goods.length > 0">
+					<component-goods-list :propData="{style_type: 1, goods_list: goods}" :propCurrencySymbol="currency_symbol" propPriceField="seckill_min_price"></component-goods-list>
+				</view>
+				<view v-else>
+					<!-- 提示信息 -->
+					<component-no-data propStatus="0" propMsg="没有相关商品"></component-no-data>
+				</view>
+			</view>
 
-            <!-- 结尾 -->
-            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
-        </view>
-        <view v-else>
-            <!-- 提示信息 -->
-            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
-        </view>
-    </view>
+			<!-- 结尾 -->
+			<component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+		</view>
+		<view v-else>
+			<!-- 提示信息 -->
+			<component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+		</view>
+	</view>
 </template>
 <script>
-    const app = getApp();
-    import componentCountdown from "../../../../components/countdown/countdown";
-    import componentNoData from "../../../../components/no-data/no-data";
-    import componentBottomLine from "../../../../components/bottom-line/bottom-line";
-    import componentGoodsList from "../../../../components/goods-list/goods-list";
+	const app = getApp();
+	import componentCountdown from "../../../../components/countdown/countdown";
+	import componentNoData from "../../../../components/no-data/no-data";
+	import componentBottomLine from "../../../../components/bottom-line/bottom-line";
+	import componentGoodsList from "../../../../components/goods-list/goods-list";
 
-    var seckill_static_url = app.globalData.get_static_url('seckill', true);
-    export default {
-        data() {
-            return {
-                seckill_bg: 'background: url('+seckill_static_url+'header-bg.png) top/100% no-repeat;',
-                data_bottom_line_status: false,
-                data_list_loding_status: 1,
-                data_list_loding_msg: '',
-                currency_symbol: app.globalData.data.currency_symbol,
-                data_base: null,
-                current: null,
-                time: null,
-                goods: [],
-                is_valid: 0,
-                // 自定义分享信息
-                share_info: {}
-            };
-        },
+	var seckill_static_url = app.globalData.get_static_url('seckill', true);
+	export default {
+		data() {
+			return {
+				seckill_bg: 'background: url(' + seckill_static_url + 'header-bg.png) top/100% no-repeat;',
+				data_bottom_line_status: false,
+				data_list_loding_status: 1,
+				data_list_loding_msg: '',
+				currency_symbol: app.globalData.data.currency_symbol,
+				data_base: null,
+				// 秒杀时段
+				periods_list: [],
+				current: null,
+				time: null,
+				goods: [],
+				is_valid: 0,
+				// 自定义分享信息
+				share_info: {},
+				// nav滚动下标
+				nav_active_index: 0
+			};
+		},
 
-        components: {
-            componentCountdown,
-            componentNoData,
-            componentBottomLine,
-            componentGoodsList
-        },
-        props: {},
+		components: {
+			componentCountdown,
+			componentNoData,
+			componentBottomLine,
+			componentGoodsList
+		},
+		props: {},
 
-        onLoad() {},
+		onLoad() {},
 
-        onShow() {
-            // 初始化配置
-            this.init_config();
+		onShow() {
+			// 初始化配置
+			this.init_config();
 
-            // 获取数据
-            this.get_data();
-        },
+			// 获取数据
+			this.get_data();
+		},
 
-        // 下拉刷新
-        onPullDownRefresh() {
-            this.get_data();
-        },
+		// 下拉刷新
+		onPullDownRefresh() {
+			this.get_data();
+		},
 
-        methods: {
-            // 初始化配置
-            init_config(status) {
-                if ((status || false) == true) {
-                    this.setData({
-                        currency_symbol: app.globalData.get_config('currency_symbol'),
-                    });
-                } else {
-                    app.globalData.is_config(this, 'init_config');
-                }
-            },
+		methods: {
+			// 初始化配置
+			init_config(status) {
+				if ((status || false) == true) {
+					this.setData({
+						currency_symbol: app.globalData.get_config('currency_symbol'),
+					});
+				} else {
+					app.globalData.is_config(this, 'init_config');
+				}
+			},
 
-            // 获取数据
-            get_data() {
-                uni.request({
-                    url: app.globalData.get_request_url("index", "index", "seckill"),
-                    method: 'POST',
-                    data: {},
-                    dataType: 'json',
-                    success: res => {
-                        uni.stopPullDownRefresh();
-                        if (res.data.code == 0) {
-                            var data = res.data.data;
-                            var data_base = data.config || null;
-                            var current = data.current || null;
-                            var time = (current == null) ? null : current.time || null;
-                            var goods = (current == null) ? [] : (current.goods || []);
-                            var is_valid = (time == null) ? 0 : (time.status == 1 ? 1 : 0);
-                            if(goods.length > 0) {
-                                for(var i in goods) {
-                                    goods[i]['price_icon'] = (is_valid == 1) ? (current.goods_detail_icon || '秒杀价') : '';
-                                }
-                            }
-                            this.setData({
-                                data_base: data_base,
-                                current: current,
-                                time: time,
-                                goods: goods,
-                                is_valid: is_valid,
-                                data_list_loding_msg: '',
-                                data_list_loding_status: 0,
-                                data_bottom_line_status: (goods.length > 0)
-                            });
+			// 获取数据
+			get_data() {
+				uni.request({
+					url: app.globalData.get_request_url("index", "index", "seckill"),
+					method: 'POST',
+					data: {},
+					dataType: 'json',
+					success: res => {
+						uni.stopPullDownRefresh();
+						if (res.data.code == 0) {
+							var data = res.data.data;
+							var data_base = data.config || null;
+							var current = data.current || null;
+							var time = (current == null) ? null : current.time || null;
+							var goods = (current == null) ? [] : (current.goods || []);
+							var is_valid = (time == null) ? 0 : (time.status == 1 ? 1 : 0);
+							if (goods.length > 0) {
+								for (var i in goods) {
+									goods[i]['price_icon'] = (is_valid == 1) ? (current.goods_detail_icon || '秒杀价') : '';
+								}
+							}
+							this.setData({
+								periods_list: data.periods_list,
+								data_base: data_base,
+								current: current,
+								time: time,
+								goods: goods,
+								is_valid: is_valid,
+								data_list_loding_msg: '',
+								data_list_loding_status: 0,
+								data_bottom_line_status: (goods.length > 0)
+							});
+							console.log(this.periods_list);
 
-                            if ((this.data_base || null) != null) {
-                                // 基础自定义分享
-                                this.setData({
-                                    share_info: {
-                                        title: this.data_base.seo_title || this.data_base.application_name,
-                                        desc: this.data_base.seo_desc,
-                                        path: '/pages/plugins/seckill/index/index',
-                                        img: ((this.slider || null) != null && this.slider.length > 0) ? this.slider[0]['images_url'] : ''
-                                    }
-                                });
+							if ((this.data_base || null) != null) {
+								// 基础自定义分享
+								this.setData({
+									share_info: {
+										title: this.data_base.seo_title || this.data_base.application_name,
+										desc: this.data_base.seo_desc,
+										path: '/pages/plugins/seckill/index/index',
+										img: ((this.slider || null) != null && this.slider.length > 0) ? this.slider[0]['images_url'] : ''
+									}
+								});
 
-                                // 导航名称
-                                if((this.data_base.application_name || null) != null) {
-                                    uni.setNavigationBarTitle({
-                                        title: this.data_base.application_name
-                                    });
-                                }
-                            }
-                        } else {
-                            this.setData({
-                                data_bottom_line_status: false,
-                                data_list_loding_status: 2,
-                                data_list_loding_msg: res.data.msg
-                            });
-                        }
+								// 导航名称
+								if ((this.data_base.application_name || null) != null) {
+									uni.setNavigationBarTitle({
+										title: this.data_base.application_name
+									});
+								}
+							}
+						} else {
+							this.setData({
+								data_bottom_line_status: false,
+								data_list_loding_status: 2,
+								data_list_loding_msg: res.data.msg
+							});
+						}
 
-                        // 分享菜单处理
-                        app.globalData.page_share_handle(this.share_info);
-                    },
-                    fail: () => {
-                        uni.stopPullDownRefresh();
-                        this.setData({
-                            data_bottom_line_status: false,
-                            data_list_loding_status: 2,
-                            data_list_loding_msg: '服务器请求出错'
-                        });
-                        app.globalData.showToast('服务器请求出错');
-                    }
-                });
-            }
-        }
-    };
+						// 分享菜单处理
+						app.globalData.page_share_handle(this.share_info);
+					},
+					fail: () => {
+						uni.stopPullDownRefresh();
+						this.setData({
+							data_bottom_line_status: false,
+							data_list_loding_status: 2,
+							data_list_loding_msg: '服务器请求出错'
+						});
+						app.globalData.showToast('服务器请求出错');
+					}
+				});
+			},
+			nav_event(e) {
+				let index = e.currentTarget.dataset.index;
+				this.setData({
+					nav_active_index: index
+				});
+			}
+		}
+	};
 </script>
-<style>
+<style scoped>
+	@import './index.css';
 </style>
\ No newline at end of file